From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Mon, 01 Aug 2011 18:31:03 GMT
Subject: Re: [PATCH 17/18] revert: Introduce --continue to continue the operation
Message-ID: <CALkWK0npaR+FESUEBUJv_pyL1prshBBy9MifOn6UUG8rDOJnXQ@mail.gmail.com>
In-Reply-To: <1312222025-28453-18-git-send-email-artagnon@gmail.com>

Hi again,

Ramkumar Ramachandra writes:
> +test_expect_success 'malformed instruction sheet 1' '
> +       pristine_detach initial &&
> +       test_must_fail git cherry-pick base..anotherpick &&
> +       echo "resolved" >foo &&
> +       git add foo &&
> +       git commit &&
> +       sed "s/pick /pick/" .git/sequencer/todo >new_sheet
> +       cp new_sheet .git/sequencer/todo
> +       test_must_fail git cherry-pick --continue
> +'

Ugh.  I forgot to chain using '&&' .

> +test_expect_success 'malformed instruction sheet 2' '
> +       pristine_detach initial &&
> +       test_must_fail git cherry-pick base..anotherpick &&
> +       echo "resolved" >foo &&
> +       git add foo &&
> +       git commit &&
> +       sed "s/pick/revert/" .git/sequencer/todo >new_sheet
> +       cp new_sheet .git/sequencer/todo
> +       test_must_fail git cherry-pick --continue
> +'

Here too.

Please squash this in while reading -- thanks :)
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>

diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 457ad76..626136a 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -195,8 +195,8 @@ test_expect_success 'malformed instruction sheet 1' '
 	echo "resolved" >foo &&
 	git add foo &&
 	git commit &&
-	sed "s/pick /pick/" .git/sequencer/todo >new_sheet
-	cp new_sheet .git/sequencer/todo
+	sed "s/pick /pick/" .git/sequencer/todo >new_sheet &&
+	cp new_sheet .git/sequencer/todo &&
 	test_must_fail git cherry-pick --continue
 '

@@ -206,8 +206,8 @@ test_expect_success 'malformed instruction sheet 2' '
 	echo "resolved" >foo &&
 	git add foo &&
 	git commit &&
-	sed "s/pick/revert/" .git/sequencer/todo >new_sheet
-	cp new_sheet .git/sequencer/todo
+	sed "s/pick/revert/" .git/sequencer/todo >new_sheet &&
+	cp new_sheet .git/sequencer/todo &&
 	test_must_fail git cherry-pick --continue
 '

-- Ram