[PATCH v2] git-am: indicate where a failed patch is to be found.
- From
- Paul Gortmaker <paul.gortmaker@windriver.com>
- Date
- Jul 13, 2012, 15:51 UTC
- Message-ID
- <1342194690-31578-1-git-send-email-paul.gortmaker@windriver.com>
- In-Reply-To
- <7vobnkadsw.fsf@alter.siamese.dyndns.org>
If git am fails to apply something, the end user may need to know where to find the patch. This is normally known for a single patch, but if the user is processing a mbox with many patches, they may not have a single broken out patch handy. So, provide a helpful hint as to where they can find the patch to do some sort of manual fixup, if we are processing a mbox with more than one patch in it.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- [v2: drop text suggesting what to do with failed patch; only emit the help text if we are processing mbox with multi patches]
git-am.sh | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/git-am.sh b/git-am.sh index f8b7a0c..20b3b73 100755 --- a/git-am.sh +++ b/git-am.sh @@ -855,6 +855,11 @@ did you forget to use 'git add'?" if test $apply_status != 0 then eval_gettextln 'Patch failed at $msgnum $FIRSTLINE' + if test $patch_format = mbox && test "$last" -ne "1" + then + eval_gettextln "You can find the copy of the patch that failed here: + $dotest/patch" + fi stop_here_user_resolve $this fi
-- 1.7.9.7