| commit | 4c7f5440225aba8f0c7253575e5ffa933a267de7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 30 Oct 2018 06:43:46 +0000 (30 15:43 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 30 Oct 2018 06:43:46 +0000 (30 15:43 +0900) | ||
| tree | 498a09bea3303497ac2c101b79371538b188aeae | treesnapshot (tar.gz zip) |
| parent | 5742ba504c04420446556a389e5b99e6b228d928 | commitdiff |
| parent | b072a25fad21b8aecfa29f6ffb813a0a6194a764 | commitdiff |
Merge branch 'jc/receive-deny-current-branch-fix'
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
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 | blobhistory |
| t/t5516-fetch-push.sh | diff1 | diff2 | blobhistory |