summaryrefslogtreecommitdiff
path: root/t/t6120-describe.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-10 12:30:43 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-10 12:30:43 -0800
commit48cbf915a4738097f291de06e23d293f79ff3f9e (patch)
treeca9b4a0f606900e8536e704508fd318d7514d2f0 /t/t6120-describe.sh
parentMerge branch 'sr/blame-incomplete' (diff)
parentTeach "git describe" --dirty option (diff)
downloadtgif-48cbf915a4738097f291de06e23d293f79ff3f9e.tar.xz
Merge branch 'jp/dirty-describe'
* jp/dirty-describe: Teach "git describe" --dirty option
Diffstat (limited to 't/t6120-describe.sh')
-rwxr-xr-xt/t6120-describe.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index f5a1b615f6..c050f94bc6 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -125,6 +125,20 @@ test_expect_success 'rename tag Q back to A' '
test_expect_success 'pack tag refs' 'git pack-refs'
check_describe A-* HEAD
+check_describe "A-*[0-9a-f]" --dirty
+
+test_expect_success 'set-up dirty work tree' '
+ echo >>file
+'
+
+check_describe "A-*[0-9a-f]-dirty" --dirty
+
+check_describe "A-*[0-9a-f].mod" --dirty=.mod
+
+test_expect_success 'describe --dirty HEAD' '
+ test_must_fail git describe --dirty HEAD
+'
+
test_expect_success 'set-up matching pattern tests' '
git tag -a -m test-annotated test-annotated &&
echo >>file &&