diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-08 23:01:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-08 23:01:15 -0700 |
| commit | 1c9f54417e22103a04c51293369a48b6d3386ac4 (patch) | |
| tree | 70b9563b202f70c463dca9b6c5cb80e9352eae7d /t | |
| parent | 1f398ee772552ba9763d979cf66566e48acfa302 (diff) | |
| parent | 76aac715465b7678ca5b834ccbdcb88a3ab8a9f4 (diff) | |
| download | git-1c9f54417e22103a04c51293369a48b6d3386ac4.tar.gz | |
Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1
* bc/maint-1.6.1-branch-deleted-was:
git-branch: display "was sha1" on branch deletion rather than just "sha1"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3200-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 61a2010f5b..1b1e9ece57 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -195,7 +195,7 @@ test_expect_success 'test deleting branch deletes branch config' \ test_expect_success 'test deleting branch without config' \ 'git branch my7 s && sha1=$(git rev-parse my7 | cut -c 1-7) && - test "$(git branch -d my7 2>&1)" = "Deleted branch my7 ($sha1)."' + test "$(git branch -d my7 2>&1)" = "Deleted branch my7 (was $sha1)."' test_expect_success 'test --track without .fetch entries' \ 'git branch --track my8 && |