[PATCH 4/4] revert: improve success message by adding abbreviated commit sha1
From: Christian Couder <hidden>
Date: 2016-06-15 22:49:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
Instead of "Finished one cherry-pick." or "Finished one revert.", we now print "Finished cherry-pick commit <abbreviated sha1>." or "Finished revert commit <abbreviated sha1>." which is more informative especially when cherry-picking or reverting many commits. In case of failure the message is now "Automatic cherry-pick commit <abbreviated sha1> failed." instead of "Automatic cherry-pick failed.". Signed-off-by: Christian Couder <redacted> --- builtin/revert.c | 5 +++-- t/t3508-cherry-pick-many-commits.sh | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index ec931bd..36479f9 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c@@ -492,7 +492,8 @@ static int do_pick_commit(void) } } - strbuf_addstr(&mebuf, me); + strbuf_addf(&mebuf, "%s commit %s", me, + find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); if (!strategy || !strcmp(strategy, "recursive") || action == REVERT) { res = do_recursive_merge(base, next, base_label, next_label,
@@ -521,7 +522,7 @@ static int do_pick_commit(void) if (!no_commit) res = run_git_commit(defmsg); if (!res) - fprintf(stderr, "Finished one %s.\n", mebuf.buf); + fprintf(stderr, "Finished %s.\n", mebuf.buf); } strbuf_release(&mebuf);
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
index 6555f92..1bd3ca1 100755
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh@@ -24,9 +24,9 @@ test_expect_success setup ' test_expect_success 'cherry-pick first..fourth works' ' cat <<-EOF > expected && - Finished one cherry-pick. - Finished one cherry-pick. - Finished one cherry-pick. + Finished cherry-pick commit $(git rev-parse --short second). + Finished cherry-pick commit $(git rev-parse --short third). + Finished cherry-pick commit $(git rev-parse --short fourth). EOF git checkout -f master &&
@@ -41,9 +41,9 @@ test_expect_success 'cherry-pick first..fourth works' ' test_expect_success 'cherry-pick --strategy resolve first..fourth works' ' cat <<-EOF > expected && - Finished one cherry-pick with strategy resolve. - Finished one cherry-pick with strategy resolve. - Finished one cherry-pick with strategy resolve. + Finished cherry-pick commit $(git rev-parse --short second) with strategy resolve. + Finished cherry-pick commit $(git rev-parse --short third) with strategy resolve. + Finished cherry-pick commit $(git rev-parse --short fourth) with strategy resolve. EOF git checkout -f master &&
--
1.7.2.rc1.215.g2dff2.dirty