summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-06 13:11:24 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-06 13:11:24 +0900
commita823e3a7fc75c25677d7d6eaa9defc089412ff0e (patch)
treeed3aea71a27fe2723467d4349b582ade991609c6 /ll-merge.h
parentMerge branch 'sb/diff-color-moved-use-xdl-recmatch' (diff)
parentworktree: handle broken symrefs in find_shared_symref() (diff)
downloadtgif-a823e3a7fc75c25677d7d6eaa9defc089412ff0e.tar.xz
Merge branch 'jk/misc-resolve-ref-unsafe-fixes'
Some codepaths did not check for errors when asking what branch the HEAD points at, which have been fixed. * jk/misc-resolve-ref-unsafe-fixes: worktree: handle broken symrefs in find_shared_symref() log: handle broken HEAD in decoration check remote: handle broken symrefs test-ref-store: avoid passing NULL to printf
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions