undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pg/maint-1.7.9-am-where-is-patch'

Browse Source 
When "git am" failed, old timers knew to check .git/rebase-apply/patch
to see what went wrong, but we never told the users about it.

* pg/maint-1.7.9-am-where-is-patch:
  am: indicate where a failed patch is to be found
This commit is contained in:
Junio C Hamano 2012-07-22 12:56:02 -07:00
commit 80ee1e0469
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/config.txt
View File

@ -177,6 +177,9 @@ advice.*::
Advice shown when you used linkgit:git-checkout[1] to Advice shown when you used linkgit:git-checkout[1] to
move to the detach HEAD state, to instruct how to create move to the detach HEAD state, to instruct how to create
a local branch after the fact. a local branch after the fact.
amWorkDir::
Advice that shows the location of the patch file when
linkgit:git-am[1] fails to apply it.
-- --
core.fileMode:: core.fileMode::

5
git-am.sh
View File

@ -857,6 +857,11 @@ did you forget to use 'git add'?"
if test $apply_status != 0 if test $apply_status != 0
then then
eval_gettextln 'Patch failed at $msgnum $FIRSTLINE' eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
if test "$(git config --bool advice.amworkdir)" != false
then
eval_gettextln "The copy of the patch that failed is found in:
$dotest/patch"
fi
stop_here_user_resolve $this stop_here_user_resolve $this
fi fi