]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a30374 b112b14)
Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:26 +0000 (14:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:26 +0000 (14:41 -0700)
commit17850efa5f5c471f622d860e8ebd9f28de3c388e
treeaf9e8cc9711e145d61f87e201d8ffa29415ce8dftree | snapshot
parent5a30374a29a4ee9725d6ea165ead19a748eaed4ccommit | diff
parentb112b14d7869bf3c000abb84cd22e57dd811d031commit | diff
Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint

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
builtin/receive-pack.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.