[PATCH] Add abbreviated commit hash to rebase conflict message
Also move the $msgnum to a more sensible location.
Before:
Patch failed at 0001 msg
After:
Patch 0001 failed at [da65151] msg
Reviewed-by: Eric Herman <eric@freesa.org>
Reviewed-by: Fernando Vezzosi <buccia@repnz.net>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
git-am.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 9042432..9d70588 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -837,7 +837,8 @@ did you forget to use 'git add'?"
fi
if test $apply_status != 0
then
- eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
+ abbrev_commit=$(git log -1 --pretty=%h $commit)
+ eval_gettextln 'Patch $msgnum failed at [$abbrev_commit] $FIRSTLINE'
stop_here_user_resolve $this
fi
--
1.7.8.rc0.36.g67522.dirty
Sverre Rabbelier <srabbelier@gmail.com>