[PATCH v2] am: ignore leading whitespace before patch
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Aug 8, 2011, 02:49 UTC
- Message-ID
- <20110808024904.GF19551@elie.gateway.2wire.net>
- In-Reply-To
- <7vvcub16e7.fsf@alter.siamese.dyndns.org>
From: David Barr <davidbarr@google.com>
Some web-based email clients prepend whitespace to raw message transcripts to workaround content-sniffing in some browsers. Adjust the patch format detection logic to ignore leading whitespace.
So now you can apply patches from GMail with "git am" in three steps:
1. choose "show original" 2. tell the browser to "save as" (for example by pressing Ctrl+S) 3. run "git am" on the saved file
This fixes a regression introduced by v1.6.4-rc0~15^2~2 (git-am foreign patch support: autodetect some patch formats, 2009-05-27). GMail support was first introduced to "git am" by v1.5.4-rc0~274^2 (Make mailsplit and mailinfo strip whitespace from the start of the input, 2007-11-01).
Signed-off-by: David Barr <davidbarr@google.com> Acked-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Junio C Hamano wrote:
Show 5 quoted lines
> It no longer checks "the first few lines" but can read a lot more, so the > comment that precedes this block is now invalid. > > Also we are rather old fashioned and we never say "until [ ... ]" anywhere > in our shell scripts.
Good ideas, thanks. While at it, let's initialize l1 to protect against any stray value it might have inherited from the environment.
Looking forward to the promised test, :) Jonathan
git-am.sh | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/git-am.sh b/git-am.sh index 463c741d..c8422dbe 100755 --- a/git-am.sh +++ b/git-am.sh @@ -196,10 +196,15 @@ check_patch_format () { return 0 fi - # otherwise, check the first few lines of the first patch to try - # to detect its format + # otherwise, check the first few non-blank lines of the first + # patch to try to detect its format { - read l1 + # Start from first line containing non-whitespace + l1= + while test -z "$l1" + do + read l1 + done read l2 read l3 case "$l1" in
-- 1.7.6