git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 17/18] revert: Introduce --continue to continue the operation

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Aug 1, 2011, 18:31 UTC
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:
Show 10 quoted lines
> +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 '&&' .
Show 10 quoted lines
> +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
Previous: Ramkumar RamachandraNext: Christian Couder
Message 24 of 33 in “Sequencer for inclusion”
  1. 00/18 Sequencer for inclusionRamkumar Ramachandra, Aug 1, 2011
  2. 01/18 advice: Introduce error_resolve_conflictRamkumar Ramachandra, Aug 1, 2011
  3. 02/18 config: Introduce functions to write non-standard fileRamkumar Ramachandra, Aug 1, 2011
  4. 03/18 revert: Simplify and inline add_message_to_msgRamkumar Ramachandra, Aug 1, 2011
  5. 04/18 revert: Don't check lone argument in get_encodingRamkumar Ramachandra, Aug 1, 2011
  6. 05/18 revert: Rename no_replay to record_originRamkumar Ramachandra, Aug 1, 2011
  7. 06/18 revert: Eliminate global "commit" variableRamkumar Ramachandra, Aug 1, 2011
  8. 07/18 revert: Introduce struct to keep command-line optionsRamkumar Ramachandra, Aug 1, 2011
  9. 08/18 revert: Separate cmdline parsing from functional codeRamkumar Ramachandra, Aug 1, 2011
  10. 09/18 revert: Don't create invalid replay_opts in parse_argsRamkumar Ramachandra, Aug 1, 2011
  11. Christian CouderAug 2, 2011
  12. Christian CouderAug 2, 2011
  13. Ramkumar RamachandraAug 4, 2011
  14. 10/18 revert: Save data for continuing after conflict resolutionRamkumar Ramachandra, Aug 1, 2011
  15. 11/18 revert: Save command-line options for continuing operationRamkumar Ramachandra, Aug 1, 2011
  16. Christian CouderAug 4, 2011
  17. Ramkumar RamachandraAug 4, 2011
  18. 12/18 revert: Make pick_commits functionally act on a commit listRamkumar Ramachandra, Aug 1, 2011
  19. 13/18 revert: Introduce --reset to remove sequencer stateRamkumar Ramachandra, Aug 1, 2011
  20. 14/18 reset: Make reset remove the sequencer stateRamkumar Ramachandra, Aug 1, 2011
  21. 15/18 revert: Remove sequencer state when no commits are pendingRamkumar Ramachandra, Aug 1, 2011
  22. 16/18 revert: Don't implicitly stomp pending sequencer operationRamkumar Ramachandra, Aug 1, 2011
  23. 17/18 revert: Introduce --continue to continue the operationRamkumar Ramachandra, Aug 1, 2011
  24. Ramkumar RamachandraAug 1, 2011
  25. Christian CouderAug 2, 2011
  26. Christian CouderAug 2, 2011
  27. Christian CouderAug 2, 2011
  28. Ramkumar RamachandraAug 2, 2011
  29. Ramkumar RamachandraAug 4, 2011
  30. Christian CouderAug 2, 2011
  31. Christian CouderAug 4, 2011
  32. Ramkumar RamachandraAug 4, 2011
  33. 18/18 revert: Propagate errors upwards from do_pick_commitRamkumar Ramachandra, Aug 1, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.