From: Kevin Daudt <me@ikke.info>
To: Paul Tan <pyokagan@gmail.com>
Cc: "Junio C. Hamano" <gitster@pobox.com>,
Git List <git@vger.kernel.org>,
Kevin Daudt <compufreak@gmail.com>
Subject: Re: [PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled
Date: Wed, 17 Jun 2015 12:40:03 +0200 [thread overview]
Message-ID: <20150617104003.GA7345@vps892.directvps.nl> (raw)
In-Reply-To: <CACRoPnQ0+h2g2cUJk+8zSkcHjoHjezAGC=5pTjn8aFsgB0GrQA@mail.gmail.com>
On Thu, Jun 11, 2015 at 09:34:08PM +0800, Paul Tan wrote:
> On Sun, Jun 7, 2015 at 5:12 AM, Kevin Daudt <me@ikke.info> wrote:
> > From: Kevin Daudt <compufreak@gmail.com>
> >
> > Signed-off-by: Kevin Daudt <me@ikke.info>
>
> Ehh? The sign-off does not match the author of the patch.
I changed it, but aparently forgot to reset the author for that commit
>
> > '
> >
> > +test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
> > + test_config branch.to-rebase.rebase true &&
>
> Ok, though I wonder why not just a git pull --rebase...
Copied that from another test, but was doubting whether to use it or
not.
>
> > + test_config rebase.autostash true &&
> > + git checkout HEAD -- file &&
>
> Why not git reset --hard before-rebase? If we don't reset HEAD, then
> how would we know if we actually did a rebase?
>
Good tip, thanks.
> > + echo dirty > new_file &&
>
> style: echo dirty >new_file &&
>
Fixed
> > + git add new_file &&
> > + git pull . copy &&
> > + test $(git rev-parse HEAD^) = $(git rev-parse copy) &&
>
> Okay, although it would be better to use "test_cmp_rev HEAD^ copy"
> because it prints out the hashes if they are different.
>
Didn't know about that, and aparently, also not documented. Thanks.
> > + test $(cat new_file) = dirty &&
>
> "$(cat new_file)" should be quoted to prevent field splitting.
>
Fixed
New patch is coming.
next prev parent reply other threads:[~2015-06-17 10:40 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
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 [this message]
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=20150617104003.GA7345@vps892.directvps.nl \
--to=me@ikke.info \
--cc=compufreak@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.com \
/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.