From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Jun 2015 19:45:58 GMT
Subject: Re: [PATCH v3 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD
Message-ID: <xmqqwpz0er61.fsf@gitster.dls.corp.google.com>
In-Reply-To: <cover.1434645436.git.johannes.schindelin@gmx.de>

Thanks.

This round looks good, except one trivial nit (below), which I'll
locally squash-in a fix for.

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index fb1b571..6938e5e 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1052,7 +1052,7 @@ test_expect_failure 'rebase --continue removes CHERRY_PICK_HEAD' '
 	git reset --hard HEAD~2 &&
 	git cherry-pick seq-onto &&
 	set_fake_editor &&
-	FAKE_LINES= test_must_fail git rebase -i seq-onto &&
+	test_must_fail env FAKE_LINES= git rebase -i seq-onto &&
 	test -d .git/rebase-merge &&
 	git rebase --continue &&
 	git diff --exit-code seq-onto &&
-- 
2.4.4-569-gdcc90bb