# [PATCH 4/4] revert: improve success message by adding abbreviated commit sha1 3 messages from 2010-07-13 to 2010-07-17. Participants: Christian Couder, Jonathan Nieder. Thread: https://gitlist.dev/t/24404 ## Christian Couder, 2010-07-13 23:28 Subject: [PATCH 4/4] revert: improve success message by adding abbreviated commit sha1 Message-ID: <20100713232816.7738.78221.chriscool@tuxfamily.org> URL: https://gitlist.dev/e/20100713232816.7738.78221.chriscool%40tuxfamily.org ``` Instead of "Finished one cherry-pick." or "Finished one revert.", we now print "Finished cherry-pick commit ." or "Finished revert commit ." which is more informative especially when cherry-picking or reverting many commits. In case of failure the message is now "Automatic cherry-pick commit failed." instead of "Automatic cherry-pick failed.". Signed-off-by: Christian Couder --- 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 ``` ## Jonathan Nieder, 2010-07-15 22:51 Subject: Re: [PATCH 4/4] revert: improve success message by adding abbreviated commit sha1 Message-ID: <20100715225141.GB7253@burratino> URL: https://gitlist.dev/e/20100715225141.GB7253%40burratino In-Reply-To: <20100713232816.7738.78221.chriscool@tuxfamily.org> ``` Christian Couder wrote: > --- 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). If the redirections are changed to <<-\EOF before, then they would need to be changed back to <<-EOF here. > Instead of "Finished one cherry-pick." or "Finished one > revert.", we now print "Finished cherry-pick commit > ." “Finished cherry-pick of commit f67ab8.” sounds more better to my ear. Finished cherry-pick of foo. Finished cherry-pick of bar. Finished cherry-pick of baz. etc is a lot saner than Finished one cherry-pick. Finished one cherry-pick. Finisehd one cherry-pick. etc Thanks for making it happen. diff --git a/builtin/revert.c b/builtin/revert.c index 36479f9..e261fb2 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -492,7 +492,7 @@ static int do_pick_commit(void) } } - strbuf_addf(&mebuf, "%s commit %s", me, + strbuf_addf(&mebuf, "%s of commit %s", me, find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); if (!strategy || !strcmp(strategy, "recursive") || action == REVERT) { diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index 1bd3ca1..5af5905 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 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). + Finished cherry-pick of commit $(git rev-parse --short second). + Finished cherry-pick of commit $(git rev-parse --short third). + Finished cherry-pick of 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 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. + Finished cherry-pick of commit $(git rev-parse --short second) with strategy resolve. + Finished cherry-pick of commit $(git rev-parse --short third) with strategy resolve. + Finished cherry-pick of commit $(git rev-parse --short fourth) with strategy resolve. EOF git checkout -f master && -- ``` ## Christian Couder, 2010-07-17 20:17 Subject: Re: [PATCH 4/4] revert: improve success message by adding abbreviated commit sha1 Message-ID: <201007172217.02500.chriscool@tuxfamily.org> URL: https://gitlist.dev/e/201007172217.02500.chriscool%40tuxfamily.org In-Reply-To: <20100715225141.GB7253@burratino> ``` On Friday 16 July 2010 00:51:41 Jonathan Nieder wrote: > Christian Couder wrote: > > Instead of "Finished one cherry-pick." or "Finished one > > revert.", we now print "Finished cherry-pick commit > > ." > > “Finished cherry-pick of commit f67ab8.” sounds more better to my ear. > > Finished cherry-pick of foo. > Finished cherry-pick of bar. > Finished cherry-pick of baz. > etc > > is a lot saner than > > Finished one cherry-pick. > Finished one cherry-pick. > Finisehd one cherry-pick. > etc > > Thanks for making it happen. Thanks for your review and your patches to improve my patches! And thanks to Junio for picking up everything! Best regards, Christian. ```