summaryrefslogtreecommitdiff
path: root/builtin/update-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-23 13:56:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-29 13:17:52 -0700
commiteaa4e59c8545f61c6e61559df33dc4792e455d5a (patch)
tree502198d8fb5df6d56f347719b2c98dc68cfd99ed /builtin/update-index.c
parentmerge: clarify "pulling into void" special case (diff)
downloadtgif-eaa4e59c8545f61c6e61559df33dc4792e455d5a.tar.xz
merge: do not check argc to determine number of remote heads
To reject merging multiple commits into an unborn branch, we check argc, thinking that collect_parents() that reads the remaining command line arguments from <argc, argv> will give us the same number of commits as its input, i.e. argc. Because what we really care about is the number of commits, let the function run and then make sure it returns only one commit instead. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/update-index.c')
0 files changed, 0 insertions, 0 deletions