Well, these patches solve the problem. Thanks for your work! On Wed, Feb 24, 2010 at 10:59 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Michael Lukashov <michael.lukashov@xxxxxxxxx> writes: > >> Patch 3 does not apply correctly: > > It probably has a trivial confict, because there is an added test to the > second patch since I sent it out. Please add this after applying [2/3]. > > diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh > index c18d829..84059d8 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 > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html