Re: [PATCH v2 1/2] t5520-pull: Simplify --rebase with dirty tree test

From: Paul Tan <pyokagan@gmail.com>
Date: Jun 11, 2015, 13:20 UTC
Message-ID: <CACRoPnSnxT2_joEcgiimbiuo53sA_JobNGHj+ZJ_1+mjkaG8HQ@mail.gmail.com>
In-Reply-To: <1433625145-29668-1-git-send-email-me@ikke.info>

On Sun, Jun 7, 2015 at 5:12 AM, Kevin Daudt <me@ikke.info> wrote:

Show 22 quoted lines

> @@ -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