summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-02-06 22:05:21 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-02-06 22:05:21 -0800
commitcfd9167c15e7b09f3964204964a4c158108c6403 (patch)
tree678a4051a44c8931ea469123528679e9987d0689 /t
parentMerge branch 'km/init-doc-typofix' (diff)
parentt1512: test ambiguous cat-file --batch and --batch-output (diff)
downloadtgif-cfd9167c15e7b09f3964204964a4c158108c6403.tar.xz
Merge branch 'dt/cat-file-batch-ambiguous'
"git cat-file --batch" reported a dangling symbolic link by mistake, when it wanted to report that a given name is ambiguous. * dt/cat-file-batch-ambiguous: t1512: test ambiguous cat-file --batch and --batch-output Do not print 'dangling' for cat-file in case of ambiguity
Diffstat (limited to 't')
-rwxr-xr-xt/t1512-rev-parse-disambiguation.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index e4d5b56014..c19fb500cb 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -388,4 +388,14 @@ test_expect_success C_LOCALE_OUTPUT 'ambiguous commits are printed by type first
done
'
+test_expect_success 'cat-file --batch and --batch-check show ambiguous' '
+ echo "0000 ambiguous" >expect &&
+ echo 0000 | git cat-file --batch-check >actual 2>err &&
+ test_cmp expect actual &&
+ test_i18ngrep hint: err &&
+ echo 0000 | git cat-file --batch >actual 2>err &&
+ test_cmp expect actual &&
+ test_i18ngrep hint: err
+'
+
test_done