undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Fix describe --tags --long so it does not segfault
This commit is contained in:
Junio C Hamano 2008-07-02 21:57:50 -07:00
commit 7d3580d74c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-describe.c
View File

@ -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;
}

2
t/t6120-describe.sh
View File

@ -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