aboutsummaryrefslogtreecommitdiff
path: root/t/t6120-describe.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-07-03 02:32:45 +0000
committerJunio C Hamano <gitster@pobox.com>2008-07-02 21:21:59 -0700
commit14d4642e2a472ba4c06e10a3f5623d944b869314 (patch)
treef19a9f78bc6a56bcc7bb64498277217103e171ba /t/t6120-describe.sh
parent7ad0f27b925463c5ca6908573ed24ede11a9981f (diff)
downloadgit-14d4642e2a472ba4c06e10a3f5623d944b869314.tar.gz
git-14d4642e2a472ba4c06e10a3f5623d944b869314.tar.xz
Fix describe --tags --long so it does not segfault
If we match a lightweight (non-annotated tag) as the name to output and --long was requested we do not have a tag, nor do we have a tagged object to display. Instead we must use the object we were passed as input for the long format display. Reported-by: Mark Burton <markb@ordern.com> Backtraced-by: Mikael Magnusson <mikachu@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6120-describe.sh')
-rwxr-xr-xt/t6120-describe.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index c6be2597f..2fb672c3b 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -139,4 +139,6 @@ check_describe "test1-lightweight-*" --tags --match="test1-*"
check_describe "test2-lightweight-*" --tags --match="test2-*"
+check_describe "test2-lightweight-*" --long --tags --match="test2-*" HEAD^
+
test_done