diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:46 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:46 +0900 |
| commit | 4c7f5440225aba8f0c7253575e5ffa933a267de7 (patch) | |
| tree | 498a09bea3303497ac2c101b79371538b188aeae /t/t3308-notes-merge.sh | |
| parent | Merge branch 'ds/ci-commit-graph-and-midx' (diff) | |
| parent | receive: denyCurrentBranch=updateinstead should not blindly update (diff) | |
| download | tgif-4c7f5440225aba8f0c7253575e5ffa933a267de7.tar.xz | |
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
Diffstat (limited to 't/t3308-notes-merge.sh')
0 files changed, 0 insertions, 0 deletions