summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorDavid Barr <davidbarr@google.com>2011-08-08 02:49:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-11 20:01:18 (GMT)
commit0e8341f29d6541f661cc52f27f96877c0fd469c2 (patch)
tree7fd5cd4fef4f77c6cc418931a3795185d5701024 /compat
parente7a85be3cfc4ee017f59f1d1f8ceb63d7c88c9c8 (diff)
downloadgit-0e8341f29d6541f661cc52f27f96877c0fd469c2.zip
git-0e8341f29d6541f661cc52f27f96877c0fd469c2.tar.gz
git-0e8341f29d6541f661cc52f27f96877c0fd469c2.tar.bz2
am: ignore leading whitespace before patch
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> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions