Merge branch 'maint'

gitster · gitster · commit 7d3580d74c6d · 2008-07-02T21:57:50.000-07:00
* maint:
  Fix describe --tags --long so it does not segfault
diff --git a/builtin-describe.c b/builtin-describe.c
@@ -204,7 +204,7 @@ static void describe(const char *arg, int last_one)
 		 */
 		display_name(n);
 		if (longformat)
-			show_suffix(0, n->tag->tagged->sha1);
+			show_suffix(0, n->tag ? n->tag->tagged->sha1 : sha1);
 		printf("\n");
 		return;
 	}
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ static void describe(const char *arg, int last_one)`
`204`	`204`	`*/`
`205`	`205`	`display_name(n);`
`206`	`206`	`if (longformat)`
`207`		`- show_suffix(0, n->tag->tagged->sha1);`
	`207`	`+ show_suffix(0, n->tag ? n->tag->tagged->sha1 : sha1);`
`208`	`208`	`printf("\n");`
`209`	`209`	`return;`
`210`	`210`	`}`