From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: git@vger.kernel.org, szeder@ira.uka.de
Subject: Re: [PATCH 1/2] t3404: demonstrate CHERRY_PICK_HEAD bug
Date: Wed, 17 Jun 2015 10:33:39 -0700 [thread overview]
Message-ID: <xmqqtwu66xzg.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <f76ca5d0b6687a4d2ee4f587d8ba75a643a33c04.1434528725.git.johannes.schindelin@gmx.de> (Johannes Schindelin's message of "Wed, 17 Jun 2015 10:16:08 +0200")
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> +test_expect_failure 'rebase --continue removes CHERRY_PICK_HEAD' '
> + git checkout -b commit-to-skip &&
> + for double in X 3 1
> + do
> + seq 5 | sed "s/$double/&&/" >seq &&
> + git add seq &&
> + test_tick &&
> + git commit -m seq-$double
> + done &&
> + git tag seq-onto &&
> + git reset --hard HEAD~2 &&
> + git cherry-pick seq-onto &&
> + test_must_fail git rebase -i seq-onto &&
Shouldn't this explicitly specify what fake editor is to be used,
instead of relying on whatever the last test happened to have used?
I thought this deserved to go to older maintenance track, but the
fake editor that was used last are different between branches, so
"rebase -i" fails for a wrong reason (i.e. cannot spawn the editor)
when queued on say maint-2.2.
> + test -d .git/rebase-merge &&
> + git rebase --continue &&
> + git diff seq-onto &&
I am puzzled with this "diff"; what is this about? Is it a remnant
from an earlier debugging session, or is it making sure seq-onto is
a valid tree-ish?
> + test ! -d .git/rebase-merge &&
> + test ! -f .git/CHERRY_PICK_HEAD
> +'
> +
> test_done
Thanks.
next prev parent reply other threads:[~2015-06-17 17:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-16 12:06 rebase -i might leave CHERRY_PICK_HEAD behind SZEDER Gábor
2015-06-16 14:56 ` Johannes Schindelin
2015-06-17 8:15 ` [PATCH 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD Johannes Schindelin
2015-06-17 8:16 ` [PATCH 1/2] t3404: demonstrate CHERRY_PICK_HEAD bug Johannes Schindelin
2015-06-17 17:33 ` Junio C Hamano [this message]
2015-06-18 11:22 ` Johannes Schindelin
2015-06-18 16:00 ` Junio C Hamano
2015-06-18 16:16 ` Johannes Schindelin
2015-06-17 8:16 ` [PATCH 2/2] rebase -i: do not leave a CHERRY_PICK_HEAD file behind Johannes Schindelin
2015-06-17 12:58 ` SZEDER Gábor
2015-06-17 15:24 ` Johannes Schindelin
2015-06-17 16:43 ` [PATCH 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD Junio C Hamano
2015-06-18 11:44 ` [PATCH v2 " Johannes Schindelin
2015-06-18 11:44 ` [PATCH v2 1/2] t3404: demonstrate CHERRY_PICK_HEAD bug Johannes Schindelin
2015-06-18 11:44 ` [PATCH v2 2/2] rebase -i: do not leave a CHERRY_PICK_HEAD file behind Johannes Schindelin
2015-06-18 16:38 ` [PATCH v3 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD Johannes Schindelin
2015-06-18 16:38 ` [PATCH v3 1/2] t3404: demonstrate CHERRY_PICK_HEAD bug Johannes Schindelin
2015-06-18 16:38 ` [PATCH v3 2/2] rebase -i: do not leave a CHERRY_PICK_HEAD file behind Johannes Schindelin
2015-06-18 19:45 ` [PATCH v3 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD Junio C Hamano
2015-06-18 20:11 ` Johannes Schindelin
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=xmqqtwu66xzg.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=szeder@ira.uka.de \
/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.