On Sun, Jun 7, 2015 at 5:12 AM, Kevin Daudt <me@xxxxxxxxx> wrote:
> @@ -278,25 +291,6 @@ test_expect_success 'rebased upstream + fetch + pull --rebase' '
>
> '
>
> -test_expect_success 'pull --rebase dies early with dirty working directory' '
> -
> - git checkout to-rebase &&
> - git update-ref refs/remotes/me/copy copy^ &&
> - COPY=$(git rev-parse --verify me/copy) &&
> - git rebase --onto $COPY copy &&
> - test_config branch.to-rebase.remote me &&
> - test_config branch.to-rebase.merge refs/heads/copy &&
> - test_config branch.to-rebase.rebase true &&
> - echo dirty >> file &&
> - git add file &&
> - test_must_fail git pull &&
> - test $COPY = $(git rev-parse --verify me/copy) &&
> - git checkout HEAD -- file &&
> - git pull &&
> - test $COPY != $(git rev-parse --verify me/copy)
> -
> -'
Eh whoops, I don't think we should touch this test. It comes from
f9189cf, which states that:
When rebasing fails during "pull --rebase", you cannot just clean up
the working directory and call "pull --rebase" again, since the
remote branch was already fetched.
Which makes me believe that "die-ing early with dirty working
directory" has something to do with the rebased upstream handling
feature of git-pull, and so this test is correct in testing that, and
thus we should not touch it.
The location of the test in the other patch is fine though.
Thanks,
Paul
--
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