Re: [PATCH 17/18] revert: Introduce --continue to continue the operation
From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:51:42
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted>
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