diff options
| author |  Brandon Casey <casey@nrlssc.navy.mil> | 2008-12-12 17:20:07 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-12-12 20:42:59 -0800 |
| commit | a126ed0a01e265d7f3b2972a34e85636e12e6d34 (patch) | |
| tree | 3594874c3779aae3f1b1f0a9a8f74d5aa6bc7327 /t/t3200-branch.sh | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-a126ed0a01e265d7f3b2972a34e85636e12e6d34.tar.xz | |
git-branch: display sha1 on branch deletion
Make it easier to recover from a mistaken branch deletion by displaying the
sha1 of the branch's tip commit.
Update t3200 test to match the change in output.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 25e9971fd8..61a2010f5b 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -194,7 +194,8 @@ test_expect_success 'test deleting branch deletes branch config' \ test_expect_success 'test deleting branch without config' \ 'git branch my7 s && - test "$(git branch -d my7 2>&1)" = "Deleted branch my7."' + sha1=$(git rev-parse my7 | cut -c 1-7) && + test "$(git branch -d my7 2>&1)" = "Deleted branch my7 ($sha1)."' test_expect_success 'test --track without .fetch entries' \ 'git branch --track my8 && |