Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 25e9971fd86af10c1031f4e8061c31a0c80725a7..1b1e9ece572b68d5a415458c799690c06ddd3695 100755 (executable)
--- 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 (was $sha1)."'
 
 test_expect_success 'test --track without .fetch entries' \
     'git branch --track my8 &&