diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2010-07-14 01:28:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-16 15:26:03 -0700 |
| commit | f29b5e06b3bdbe3c66a01db8ee67e3c87ae55705 (patch) | |
| tree | 6ba83b2c52bcf0cedfcf7b52c6f16930f9fdc5bf /t/t3508-cherry-pick-many-commits.sh | |
| parent | 3b2c5b6df4be14cac6b36cf0db0468efa1f42916 (diff) | |
| download | git-f29b5e06b3bdbe3c66a01db8ee67e3c87ae55705.tar.gz | |
revert: improve success message by adding abbreviated commit sha1
Instead of saying "Finished one cherry-pick." or "Finished one revert.",
we now say "Finished cherry-pick of commit <abbreviated sha1>." or
"Finished revert of 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 of commit
<abbreviated sha1> failed." instead of "Automatic cherry-pick failed."
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3508-cherry-pick-many-commits.sh')
| -rwxr-xr-x | t/t3508-cherry-pick-many-commits.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index d90b365fd2..6044173007 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -23,10 +23,10 @@ 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. + cat <<-EOF >expected && + 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 && @@ -40,10 +40,10 @@ 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. + cat <<-EOF >expected && + 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 && |