Merge branch 'jg/status-config'

diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 6b3d797ceabad069aefd1337ffe366b86b523412..db228086d3977d304a3debd7c3ae6dc54c40ad17 100755 (executable)
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -261,4 +261,22 @@ test_expect_success 'rev-parse --disambiguate' '
        test "$(sed -e "s/^\(.........\).*/\1/" actual | sort -u)" = 000000000
 '
 
+test_expect_success 'ambiguous 40-hex ref' '
+       TREE=$(git mktree </dev/null) &&
+       REF=`git rev-parse HEAD` &&
+       VAL=$(git commit-tree $TREE </dev/null) &&
+       git update-ref refs/heads/$REF $VAL &&
+       test `git rev-parse $REF 2>err` = $REF &&
+       grep "refname.*${REF}.*ambiguous" err
+'
+
+test_expect_success 'ambiguous short sha1 ref' '
+       TREE=$(git mktree </dev/null) &&
+       REF=`git rev-parse --short HEAD` &&
+       VAL=$(git commit-tree $TREE </dev/null) &&
+       git update-ref refs/heads/$REF $VAL &&
+       test `git rev-parse $REF 2>err` = $VAL &&
+       grep "refname.*${REF}.*ambiguous" err
+'
+
 test_done