From: Torsten Bögershausen <tboegi@web.de>
Date: Mon, 29 Jun 2015 20:02:09 GMT
Subject: Re: What's cooking in git.git (Jun 2015, #06; Wed, 24)
Message-ID: <5591A441.2010400@web.de>
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 &&