user/sven/git.git/git-am.sh, branch v1.7.7.4

Merge branch 'gb/maint-am-stgit-author-to-from-fix'

2011-09-02T20:18:11Z

* gb/maint-am-stgit-author-to-from-fix: am: fix stgit patch mangling

Merge branch 'gb/maint-am-patch-format-error-message'

2011-09-02T20:18:07Z

* gb/maint-am-patch-format-error-message: am: format is in $patch_format, not parse_patch Conflicts: git-am.sh

am: fix stgit patch mangling

2011-08-29T16:51:44Z

Signed-off-by: Giuseppe Bilotta Signed-off-by: Junio C Hamano

am: format is in $patch_format, not parse_patch

2011-08-29T16:07:54Z

The error message given when the patch format was not recognized was wrong, since the variable checked was $parse_patch rather than $patch_format. Fix by checking the non-emptyness of the correct variable. Signed-off-by: Giuseppe Bilotta Signed-off-by: Junio C Hamano

Merge branch 'js/i18n-scripts'

2011-08-25T23:00:16Z

* js/i18n-scripts: submodule: take advantage of gettextln and eval_gettextln. stash: take advantage of eval_gettextln pull: take advantage of eval_gettextln git-am: take advantage of gettextln and eval_gettextln. gettext: add gettextln, eval_gettextln to encode common idiom

Merge branch 'db/am-skip-blank-at-the-beginning'

2011-08-19T05:07:57Z

* db/am-skip-blank-at-the-beginning: am: ignore leading whitespace before patch

Merge branch 'ma/am-exclude'

2011-08-19T05:07:54Z

* ma/am-exclude: am: Document new --exclude= option am: pass exclude down to apply

Merge branch 'maint'

2011-08-16T21:22:26Z

* maint: Prepare for 1.7.6.1 am: refresh the index at start and --resolved Conflicts: GIT-VERSION-GEN RelNotes

am: refresh the index at start and --resolved

2011-08-16T18:15:41Z

If a file is unchanged but stat-dirty, we may erroneously fail to apply patches, thinking that they conflict with a dirty working tree. This patch adds a call to "update-index --refresh". It comes as late as possible, so that we don't bother with it for thinks like "git rebase --abort", or when mbox-splitting fails. However, it does come before we actually start applying patches, meaning we will only call it once when we start applying patches (or any time we return to "am" after having resolved conflicts), and not once per patch. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

am: ignore leading whitespace before patch

2011-08-11T20:01:18Z

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 Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano