summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-05-26 15:09:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-26 15:09:56 -0700
commitf8fcb57bb45e8d3d8f7921377d6c2503590efc3c (patch)
tree507b5e2cd7d171006447032f031e2157e451c140 /builtin-merge-file.c
parentMerge branch 'jk/maint-send-email-compose' into maint (diff)
downloadtgif-f8fcb57bb45e8d3d8f7921377d6c2503590efc3c.tar.xz
show-branch --current: do not barf on detached HEAD
The code assumed that there always is the current branch, but the result from resolve_ref() on detached HEAD does not even start with "refs/heads/". Originally noticed and fixed by Stephan Beyer. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions