mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'pg/maint-1.7.9-am-where-is-patch'
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:
commit
80ee1e0469
|
@ -177,6 +177,9 @@ advice.*::
|
|||
Advice shown when you used linkgit:git-checkout[1] to
|
||||
move to the detach HEAD state, to instruct how to create
|
||||
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::
|
||||
|
|
|
@ -857,6 +857,11 @@ did you forget to use 'git add'?"
|
|||
if test $apply_status != 0
|
||||
then
|
||||
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
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in a new issue