aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2016-04-07 15:03:09 -0400
committerJunio C Hamano <gitster@pobox.com>2016-04-10 11:35:39 -0700
commit7fd12bfbef015bb63f2376f678d71bca54bbc64d (patch)
treeead30367ecd200ef6dfb832fd29d936d6c472a65 /git-mergetool--lib.sh
parentded83936106a94f854873e949fa7928dce8dbdd1 (diff)
downloadgit-7fd12bfbef015bb63f2376f678d71bca54bbc64d.tar.gz
git-7fd12bfbef015bb63f2376f678d71bca54bbc64d.tar.xz
show_head_ref(): check the result of resolve_ref_namespace()
Only use the result of resolve_ref_namespace() if it is non-NULL. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions