diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:51 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:51 +0900 |
| commit | 7d483e9c00516413a9c2dafc24a6ecb40975b02b (patch) | |
| tree | 54b57d8716409d4bbbd440a7dbe9e305d67bcdf0 /builtin/write-tree.c | |
| parent | Merge branch 'js/diff-notice-has-drive-prefix' into maint (diff) | |
| parent | receive: denyCurrentBranch=updateinstead should not blindly update (diff) | |
| download | tgif-7d483e9c00516413a9c2dafc24a6ecb40975b02b.tar.xz | |
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
Diffstat (limited to 'builtin/write-tree.c')
0 files changed, 0 insertions, 0 deletions