X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6120-describe.sh;h=56bbd8519d69a1fc31293f30eb3c8a7b20a285cc;hb=1eaa541f5fbda3fc30085da4f75e99dfae4ec9b3;hp=3e9edda1ca6a0c6c8e3022c1f639f7ec7728f90f;hpb=82ff9d2c8b0d449fbaae21a69bcc3b98a4012180;p=git.git

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 3e9edda1c..56bbd8519 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -15,8 +15,11 @@ test_description='test describe
 check_describe () {
 	expect="$1"
 	shift
-	R=$(git describe "$@") &&
+	R=$(git describe "$@" 2>err.actual)
+	S=$?
+	cat err.actual >&3
 	test_expect_success "describe $*" '
+	test $S = 0 &&
 	case "$R" in
 	$expect)	echo happy ;;
 	*)	echo "Oops - $R is not $expect";
@@ -28,39 +31,39 @@ check_describe () {
 test_expect_success setup '
 
 	test_tick &&
-	echo one >file && git-add file && git-commit -m initial &&
-	one=$(git-rev-parse HEAD) &&
+	echo one >file && git add file && git-commit -m initial &&
+	one=$(git rev-parse HEAD) &&
 
 	test_tick &&
-	echo two >file && git-add file && git-commit -m second &&
-	two=$(git-rev-parse HEAD) &&
+	echo two >file && git add file && git-commit -m second &&
+	two=$(git rev-parse HEAD) &&
 
 	test_tick &&
-	echo three >file && git-add file && git-commit -m third &&
+	echo three >file && git add file && git-commit -m third &&
 
 	test_tick &&
-	echo A >file && git-add file && git-commit -m A &&
+	echo A >file && git add file && git-commit -m A &&
 	test_tick &&
 	git-tag -a -m A A &&
 
 	test_tick &&
-	echo c >file && git-add file && git-commit -m c &&
+	echo c >file && git add file && git-commit -m c &&
 	test_tick &&
 	git-tag c &&
 
 	git reset --hard $two &&
 	test_tick &&
-	echo B >side && git-add side && git-commit -m B &&
+	echo B >side && git add side && git-commit -m B &&
 	test_tick &&
 	git-tag -a -m B B &&
 
 	test_tick &&
 	git-merge -m Merged c &&
-	merged=$(git-rev-parse HEAD) &&
+	merged=$(git rev-parse HEAD) &&
 
 	git reset --hard $two &&
 	test_tick &&
-	echo D >another && git-add another && git-commit -m D &&
+	echo D >another && git add another && git-commit -m D &&
 	test_tick &&
 	git-tag -a -m D D &&
 
@@ -77,7 +80,7 @@ test_expect_success setup '
 	git-merge -m Merged $merged &&
 
 	test_tick &&
-	echo X >file && echo X >side && git-add file side &&
+	echo X >file && echo X >side && git add file side &&
 	git-commit -m x
 
 '
@@ -94,4 +97,24 @@ check_describe D-* --tags HEAD^^
 check_describe A-* --tags HEAD^^2
 check_describe B --tags HEAD^^2^
 
+check_describe B-0-* --long HEAD^^2^
+check_describe A-3-* --long HEAD^^2
+
+test_expect_success 'rename tag A to Q locally' '
+	mv .git/refs/tags/A .git/refs/tags/Q
+'
+cat - >err.expect <<EOF
+warning: tag 'A' is really 'Q' here
+EOF
+check_describe A-* HEAD
+test_expect_success 'warning was displayed for Q' '
+	git diff err.expect err.actual
+'
+test_expect_success 'rename tag Q back to A' '
+	mv .git/refs/tags/Q .git/refs/tags/A
+'
+
+test_expect_success 'pack tag refs' 'git pack-refs'
+check_describe A-* HEAD
+
 test_done