Junio C Hamano b072a25fad receive: denyCurrentBranch=updateinstead should not blindly update ... The handling of receive.denyCurrentBranch=updateInstead was added to a switch statement that handles other values of the variable, but all the other case arms only checked a condition to reject the attempted push, or let later logic in the same function to still intervene, so that a push that does not fast-forward (which is checked after the switch statement in question) is still rejected. But the handling of updateInstead incorrectly took immediate effect, without giving other checks a chance to intervene. Instead of calling update_worktree() that causes the side effect immediately, just note the fact that we will need to call the function later, and first give other checks a chance to reject the request. After the update-hook gets a chance to reject the push (which happens as the last step in a series of checks), call update_worktree() when we earlier detected the need to. Reported-by: Rajesh Madamanchi Signed-off-by: Junio C Hamano <gitster@pobox.com>		2018-10-19 15:13:32 +09:00
..
add.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
am.c	Merge branch 'nd/use-opt-int-set-f'	2018-06-01 15:06:38 +09:00
annotate.c
apply.c
archive.c
bisect--helper.c
blame.c	Merge branch 'sb/blame-color'	2018-06-18 10:18:45 -07:00
branch.c	Merge branch 'rd/doc-remote-tracking-with-hyphen'	2018-06-18 10:18:43 -07:00
bundle.c
cat-file.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
check-attr.c
check-ignore.c
check-mailmap.c
check-ref-format.c
checkout-index.c
checkout.c	Merge branch 'ma/unpack-trees-free-msgs'	2018-05-30 21:51:29 +09:00
clean.c
clone.c	Merge branch 'bw/ref-prefix-for-configured-refspec'	2018-05-30 21:51:26 +09:00
column.c	column: fix off-by-one default width	2018-05-13 10:45:05 +09:00
commit-graph.c
commit-tree.c
commit.c	Merge branch 'bp/status-rename-config'	2018-05-30 14:04:07 +09:00
config.c	Merge branch 'jk/config-blob-sans-repo'	2018-05-30 21:51:27 +09:00
count-objects.c	packfile: convert has_sha1_pack to object_id	2018-05-02 13:59:49 +09:00
credential.c
describe.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
diff-files.c
diff-index.c
diff-tree.c
diff.c
difftool.c	Merge branch 'nd/use-opt-int-set-f'	2018-06-01 15:06:38 +09:00
fast-export.c	Merge branch 'bw/ref-prefix-for-configured-refspec'	2018-05-30 21:51:26 +09:00
fetch-pack.c	Merge branch 'bw/protocol-v2'	2018-05-08 15:59:16 +09:00
fetch.c	Merge branch 'nd/use-opt-int-set-f'	2018-06-01 15:06:38 +09:00
fmt-merge-msg.c
for-each-ref.c
fsck.c	Merge branch 'bc/object-id'	2018-05-30 14:04:10 +09:00
gc.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
get-tar-commit-id.c
grep.c	Merge branch 'nd/use-opt-int-set-f'	2018-06-01 15:06:38 +09:00
hash-object.c
help.c	Merge branch 'nd/command-list'	2018-06-01 15:06:37 +09:00
index-pack.c	Merge branch 'jk/index-pack-maint'	2018-06-13 12:50:46 -07:00
init-db.c	Merge branch 'rd/init-typo'	2018-06-01 15:06:40 +09:00
interpret-trailers.c
log.c	Use OPT_SET_INT_F() for cmdline option specification	2018-05-24 16:12:29 +09:00
ls-files.c	Merge branch 'nd/use-opt-int-set-f'	2018-06-01 15:06:38 +09:00
ls-remote.c	Merge branch 'bw/server-options'	2018-05-23 14:38:15 +09:00
ls-tree.c	cache.h: add repository argument to oid_object_info	2018-04-26 10:54:27 +09:00
mailinfo.c
mailsplit.c
merge-base.c
merge-file.c
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c	Merge branch 'nd/use-opt-int-set-f'	2018-06-01 15:06:38 +09:00
mktag.c
mktree.c	cache.h: add repository argument to oid_object_info	2018-04-26 10:54:27 +09:00
mv.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
name-rev.c
notes.c	Merge branch 'nd/use-opt-int-set-f'	2018-06-01 15:06:38 +09:00
pack-objects.c	Merge branch 'nd/use-opt-int-set-f'	2018-06-01 15:06:38 +09:00
pack-redundant.c	pack-redundant: convert linked lists to use struct object_id	2018-05-02 13:59:50 +09:00
pack-refs.c
patch-id.c
prune-packed.c	packfile: convert has_sha1_pack to object_id	2018-05-02 13:59:49 +09:00
prune.c	cache.h: add repository argument to oid_object_info	2018-04-26 10:54:27 +09:00
pull.c	Merge branch 'rd/doc-remote-tracking-with-hyphen'	2018-06-18 10:18:43 -07:00
push.c	transport: convert transport_push to take a struct refspec	2018-05-18 06:19:44 +09:00
read-tree.c	lock_file: move static locks into functions	2018-05-10 14:55:40 +09:00
rebase--helper.c	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	2018-04-26 12:28:43 +09:00
receive-pack.c	receive: denyCurrentBranch=updateinstead should not blindly update	2018-10-19 15:13:32 +09:00
reflog.c	Merge branch 'ds/lazy-load-trees'	2018-05-23 14:38:13 +09:00
remote-ext.c
remote-fd.c
remote.c	Merge branch 'bw/ref-prefix-for-configured-refspec'	2018-05-30 21:51:26 +09:00
repack.c	repack: add --keep-pack option	2018-04-16 13:52:29 +09:00
replace.c	Merge branch 'js/deprecate-grafts'	2018-05-23 14:38:17 +09:00
rerere.c
reset.c	builtin/reset: convert use of EMPTY_TREE_SHA1_BIN	2018-05-02 13:59:52 +09:00
rev-list.c
rev-parse.c	Merge branch 'en/rev-parse-invalid-range'	2018-06-01 15:06:39 +09:00
revert.c
rm.c	Merge branch 'ma/lockfile-cleanup'	2018-05-30 14:04:05 +09:00
send-pack.c	remote: convert match_push_refs to take a struct refspec	2018-05-18 06:19:44 +09:00
serve.c
shortlog.c
show-branch.c
show-ref.c
stripspace.c
submodule--helper.c	Sync with 2.17.2	2018-09-27 11:45:01 -07:00
symbolic-ref.c
tag.c	Merge branch 'sb/oid-object-info'	2018-05-23 14:38:16 +09:00
unpack-file.c
unpack-objects.c	Sync with Git 2.17.1	2018-05-29 17:10:05 +09:00
update-index.c	Merge branch 'js/use-bug-macro'	2018-05-30 14:04:07 +09:00
update-ref.c
update-server-info.c
upload-archive.c
upload-pack.c	Merge branch 'bw/protocol-v2'	2018-05-08 15:59:16 +09:00
var.c
verify-commit.c
verify-pack.c
verify-tag.c
worktree.c	Merge branch 'tg/worktree-add-existing-branch'	2018-05-23 14:38:18 +09:00
write-tree.c