summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-03 11:01:31 -0700
committerJunio C Hamano <gitster@pobox.com>2015-08-03 11:01:31 -0700
commit0baebca51eba05dd3c3e9edf18fc49c67b55503f (patch)
tree0b73980dac06af9d2eaf5f377e1a8ca1ab1db841 /t/t7800-difftool.sh
parent0c5470652861da01d0cff99d5bcd15cefba693f2 (diff)
parentb112b14d7869bf3c000abb84cd22e57dd811d031 (diff)
downloadgit-0baebca51eba05dd3c3e9edf18fc49c67b55503f.tar.gz
Merge branch 'jx/do-not-crash-receive-pack-wo-head'
An attempt to delete a ref by pushing into a repositorywhose HEAD symbolic reference points at an unborn branch that cannot be created due to ref D/F conflict (e.g. refs/heads/a/b exists, HEAD points at refs/heads/a) failed. * jx/do-not-crash-receive-pack-wo-head: receive-pack: crash when checking with non-exist HEAD
Diffstat (limited to 't/t7800-difftool.sh')
0 files changed, 0 insertions, 0 deletions