| commit | 1a51b52422e055e433dec9a496621341d70d38ff | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Apr 2015 06:15:45 +0000 (31 23:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Apr 2015 05:40:10 +0000 (1 22:40 -0700) | ||
| tree | 771ce6613ff70e626aeaaaf137ba7a8019b7b679 | treesnapshot (tar.gz zip) |
| parent | 0855331941b723b227e93b33955bbe0b45025659 | commitdiff |
push-to-deploy: allow pushing into an unborn branch and updating it
Setting receive.denycurrentbranch to updateinstead and pushing into
the current branch, when the working tree and the index is truly
clean, is supposed to reset the working tree and the index to match
the tree of the pushed commit. This did not work when pushing into
an unborn branch.
The code that drives push-to-checkout hook needs no change, as the
interface is defined so that hook can decide what to do when the
push is coming to an unborn branch and take an appropriate action
since the beginning.
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Setting receive.denycurrentbranch to updateinstead and pushing into
the current branch, when the working tree and the index is truly
clean, is supposed to reset the working tree and the index to match
the tree of the pushed commit. This did not work when pushing into
an unborn branch.
The code that drives push-to-checkout hook needs no change, as the
interface is defined so that hook can decide what to do when the
push is coming to an unborn branch and take an appropriate action
since the beginning.
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/receive-pack.c | diffblobblamehistory | |
| t/t5516-fetch-push.sh | diffblobblamehistory |