All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Torsten Bögershausen" <tboegi@web.de>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jun 2015, #06; Wed, 24)
Date: Mon, 29 Jun 2015 22:02:09 +0200	[thread overview]
Message-ID: <5591A441.2010400@web.de> (raw)
In-Reply-To: <xmqqwpys95bm.fsf@gitster.dls.corp.google.com>

> * js/rebase-i-clean-up-upon-continue-to-skip (2015-06-23) 2 commits
>  - rebase -i: do not leave a CHERRY_PICK_HEAD file behind
>  - t3404: demonstrate CHERRY_PICK_HEAD bug
> 
>  Abandoning an already applied change in "git rebase -i" with
>  "--continue" left CHERRY_PICK_HEAD and confused later steps.
> 
>  Will merge to 'next'.
I need a little tweak here:

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 7fd1330..f236128 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1228,7 +1228,7 @@ test_expect_success '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 &&
+               test_seq 5 | sed "s/$double/&&/" >seq &&

      parent reply	other threads:[~2015-06-29 20:02 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-24 21:14 What's cooking in git.git (Jun 2015, #06; Wed, 24) Junio C Hamano
2015-06-25  1:01 ` Stefan Beller
2015-06-25 11:04   ` Johannes Schindelin
2015-06-25 13:14     ` Junio C Hamano
2015-06-25 18:14       ` Johannes Schindelin
2015-06-29 14:32 ` Tony Finch
2015-06-29 20:02 ` Torsten Bögershausen [this message]

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=5591A441.2010400@web.de \
    --to=tboegi@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.