projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 45dda3a b072a25)
Merge branch 'jc/receive-deny-current-branch-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:51 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:51 +0000 (22:57 +0900)
commit7d483e9c00516413a9c2dafc24a6ecb40975b02b
tree54b57d8716409d4bbbd440a7dbe9e305d67bcdf0tree | snapshot
parent45dda3a2dc7f387aa344d8f0674e8e6680a68abccommit | diff
parentb072a25fad21b8aecfa29f6ffb813a0a6194a764commit | diff
Merge branch 'jc/receive-deny-current-branch-fix' into maint

The receive.denyCurrentBranch=updateInstead codepath kicked in even
when the push should have been rejected due to other reasons, such
as it does not fast-forward or the update-hook rejects it, which
has been corrected.

* jc/receive-deny-current-branch-fix:
  receive: denyCurrentBranch=updateinstead should not blindly update
builtin/receive-pack.c diff1 | diff2 | blob | history
t/t5516-fetch-push.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.