From: Paul Tan <pyokagan@gmail.com>
To: Kevin Daudt <me@ikke.info>
Cc: "Junio C. Hamano" <gitster@pobox.com>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH v2 1/2] t5520-pull: Simplify --rebase with dirty tree test
Date: Thu, 11 Jun 2015 21:20:04 +0800 [thread overview]
Message-ID: <CACRoPnSnxT2_joEcgiimbiuo53sA_JobNGHj+ZJ_1+mjkaG8HQ@mail.gmail.com> (raw)
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:
> @@ -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
next prev parent reply other threads:[~2015-06-11 13:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 21:55 [PATCH] pull: allow dirty tree when rebase.autostash enabled Kevin Daudt
2015-06-03 4:50 ` Paul Tan
2015-06-06 21:12 ` [PATCH v2 1/2] t5520-pull: Simplify --rebase with dirty tree test Kevin Daudt
2015-06-11 13:20 ` Paul Tan [this message]
2015-06-06 21:12 ` [PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled Kevin Daudt
2015-06-11 13:34 ` Paul Tan
2015-06-17 10:40 ` Kevin Daudt
2015-06-17 11:01 ` [PATCH v3] " Kevin Daudt
2015-06-17 15:36 ` Junio C Hamano
2015-07-04 21:00 ` kd/ Kevin Daudt
2015-07-04 21:42 ` [PATCH v4] pull: allow dirty tree when rebase.autostash enabled Kevin Daudt
2015-07-06 20:39 ` Junio C Hamano
2015-07-07 3:59 ` [PATCH v5] " Paul Tan
2015-07-22 19:07 ` Kevin Daudt
2015-07-22 19:42 ` Junio C Hamano
2015-07-22 20:48 ` Kevin Daudt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACRoPnSnxT2_joEcgiimbiuo53sA_JobNGHj+ZJ_1+mjkaG8HQ@mail.gmail.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ikke.info \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.