Merge branch 'os/gitweb-highlight-uncaptured' into maint

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 1323f6ff718d876ef06a071504390afa19a885a1..80e6be39d7b76d8e5daa6cad24a22a80a42e8eff 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -265,8 +265,7 @@ test_expect_success 'config information was renamed, too' \
 test_expect_success 'deleting a symref' '
        git branch target &&
        git symbolic-ref refs/heads/symref refs/heads/target &&
-       sha1=$(git rev-parse symref | cut -c 1-7) &&
-       echo "Deleted branch symref (was $sha1)." >expect &&
+       echo "Deleted branch symref (was refs/heads/target)." >expect &&
        git branch -d symref >actual &&
        test_path_is_file .git/refs/heads/target &&
        test_path_is_missing .git/refs/heads/symref &&
@@ -276,7 +275,7 @@ test_expect_success 'deleting a symref' '
 test_expect_success 'deleting a dangling symref' '
        git symbolic-ref refs/heads/dangling-symref nowhere &&
        test_path_is_file .git/refs/heads/dangling-symref &&
-       echo "Deleted branch dangling-symref (was 0000000)." >expect &&
+       echo "Deleted branch dangling-symref (was nowhere)." >expect &&
        git branch -d dangling-symref >actual &&
        test_path_is_missing .git/refs/heads/dangling-symref &&
        test_i18ncmp expect actual