From bba5322a71a3399a94f53e1dddf5bd66e493dfbc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 24 Feb 2010 10:22:06 -0800 Subject: builtin-fetch --all/--multi: propagate options correctly When running a subfetch, the code propagated some options but not others. Propagate --force, --update-head-ok and --keep options as well. Signed-off-by: Junio C Hamano --- t/t5521-pull-options.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 't/t5521-pull-options.sh') diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh index c18d82973f..84059d82d5 100755 --- a/t/t5521-pull-options.sh +++ b/t/t5521-pull-options.sh @@ -51,4 +51,25 @@ test_expect_success 'git pull -q -v' ' test -s err) ' +test_expect_success 'git pull --force' ' + mkdir clonedoldstyle && + (cd clonedoldstyle && git init && + cat >>.git/config <<-\EOF && + [remote "one"] + url = ../parent + fetch = refs/heads/master:refs/heads/mirror + [remote "two"] + url = ../parent + fetch = refs/heads/master:refs/heads/origin + [branch "master"] + remote = two + merge = refs/heads/master + EOF + git pull two && + test_commit A && + git branch -f origin && + git pull --all --force + ) +' + test_done -- cgit v1.2.3