summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-12-27 14:21:15 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-27 14:21:15 -0800
commitfcd3549ef239378d1d2ca11df9e8c91f7fa0ab2e (patch)
tree1ba8c1b2ae71e4ba500479c7471a198db3fcabaa /t
parentgit-send-email.txt: move --format-patch paragraph to a proper location (diff)
parentdescribe: Avoid unnecessary warning when using --all (diff)
downloadtgif-fcd3549ef239378d1d2ca11df9e8c91f7fa0ab2e.tar.xz
Merge branch 'sp/maint-describe-all-tag-warning' into maint
* sp/maint-describe-all-tag-warning: describe: Avoid unnecessary warning when using --all
Diffstat (limited to 't')
-rwxr-xr-xt/t6120-describe.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index e6c9e59b61..8c7e081c53 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -100,6 +100,12 @@ check_describe B --tags HEAD^^2^
check_describe B-0-* --long HEAD^^2^
check_describe A-3-* --long HEAD^^2
+: >err.expect
+check_describe A --all A^0
+test_expect_success 'no warning was displayed for A' '
+ test_cmp err.expect err.actual
+'
+
test_expect_success 'rename tag A to Q locally' '
mv .git/refs/tags/A .git/refs/tags/Q
'