diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2013-04-02 18:20:22 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-03 01:22:56 +0400 |
| commit | 87e139c0ad32b72ad989fe7d69381f1146250f7a (patch) | |
| tree | f83a437db7c9a0eb73a50326e184cecd7a5fd344 /t/t7512-status-help.sh | |
| parent | db4ef4496e7a99809f7caa52e8821320e5cca7bc (diff) | |
status: show commit sha1 in "You are currently reverting" message
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7512-status-help.sh')
| -rwxr-xr-x | t/t7512-status-help.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index d745cf4e5f..bf08d4e098 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -686,10 +686,11 @@ test_expect_success 'status while reverting commit (conflicts)' ' test_commit old to-revert.txt && echo new >to-revert.txt && test_commit new to-revert.txt && - test_must_fail git revert HEAD^ && + TO_REVERT=$(git rev-parse --short HEAD^) && + test_must_fail git revert $TO_REVERT && cat >expected <<-EOF # On branch master - # You are currently reverting a commit. + # You are currently reverting commit $TO_REVERT. # (fix conflicts and run "git revert --continue") # (use "git revert --abort" to cancel the revert operation) # @@ -710,7 +711,7 @@ test_expect_success 'status while reverting commit (conflicts resolved)' ' git add to-revert.txt && cat >expected <<-EOF # On branch master - # You are currently reverting a commit. + # You are currently reverting commit $TO_REVERT. # (all conflicts fixed: run "git revert --continue") # (use "git revert --abort" to cancel the revert operation) # |