mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* warning: "git am --whitespace=fix" broken in 1.6.4-rc2
       [not found] ` <7vy6qdupio.fsf@alter.siamese.dyndns.org>
@ 2009-07-25  8:52   ` Junio C Hamano
  0 siblings, 0 replies; only message in thread
From: Junio C Hamano @ 2009-07-25  8:52 UTC (permalink / raw)
  To: git; +Cc: linux-kernel

I am very sorry that I did not spot this earlier, but 1.6.4-rc2 has a
quite serious bug in "git apply --whitespace=fix" (hence "git am" with the
same option) in that it can lose all the added empty lines when it detects
any trailing spaces.  I've sent a fix out already, and am planning to
issue 1.6.4-rc3 this weekend, but in the meantime, please do not use it,
nor any version that contains commit 735c674 (Trailing whitespace and no
newline fix, 2009-07-22).

Unfortunately the commit is included in all recent integration branches
down to 'maint'.  I'll push out the fixes for them soonish.

Sorry for the trouble.

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-07-25  8:52 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1248308678-23280-1-git-send-email-szeder@ira.uka.de>
     [not found] ` <7vy6qdupio.fsf@alter.siamese.dyndns.org>
2009-07-25  8:52   ` warning: "git am --whitespace=fix" broken in 1.6.4-rc2 Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®