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

[PATCH 06/10] t3502, t3510: clarify cherry-pick -m failure

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Dec 14, 2011, 16:54 UTC
Message-ID
<1323881677-11117-7-git-send-email-artagnon@gmail.com>
In-Reply-To
<1323881677-11117-1-git-send-email-artagnon@gmail.com>

The "cherry-pick persists opts correctly" test in t3510 (cherry-pick-sequence) can cause some confusion, because the command actually has two points of failure:

1. "-m 1" is specified on the command-line despite the base commit
   "initial" not being a merge-commit.
2. The revision range indicates that there will be a conflict that
   needs to be resolved.

Although the former error is trapped, and cherry-pick die()s with the exit status 128, the reader may be distracted by the latter. Fix this by changing the revision range to something that wouldn't cause a conflict. Additionally, explicitly check the exit code in "cherry-pick a non-merge with -m should fail" in t3502 (cherry-pick-merge) to reassure the reader that this failure has nothing to do with the sequencer itself.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 t/t3502-cherry-pick-merge.sh    |    2 +-
 t/t3510-cherry-pick-sequence.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh
index 0ab52da..e37547f 100755
--- a/t/t3502-cherry-pick-merge.sh
+++ b/t/t3502-cherry-pick-merge.sh
@@ -35,7 +35,7 @@ test_expect_success 'cherry-pick a non-merge with -m should fail' '
 
 	git reset --hard &&
 	git checkout a^0 &&
-	test_must_fail git cherry-pick -m 1 b &&
+	test_expect_code 128 git cherry-pick -m 1 b &&
 	git diff --exit-code a --
 
 '
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index b6e822e..163ce7d 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -53,7 +53,7 @@ test_expect_success 'cherry-pick persists data on failure' '
 
 test_expect_success 'cherry-pick persists opts correctly' '
 	pristine_detach initial &&
-	test_expect_code 128 git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours base..anotherpick &&
+	test_expect_code 128 git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours initial..anotherpick &&
 	test_path_is_dir .git/sequencer &&
 	test_path_is_file .git/sequencer/head &&
 	test_path_is_file .git/sequencer/todo &&

-- 
1.7.4.1
Previous: Ramkumar RamachandraNext: Ramkumar Ramachandra
Message 39 of 45 in “Re-roll rr/revert-cherry-pick v2”
  1. 0/9 Re-roll rr/revert-cherry-pick v2Ramkumar Ramachandra, Dec 9, 2011
  2. 1/9 revert: free msg in format_todo()Ramkumar Ramachandra, Dec 9, 2011
  3. 2/9 revert: make commit subjects in insn sheet optionalRamkumar Ramachandra, Dec 9, 2011
  4. Jonathan NiederDec 9, 2011
  5. 3/9 revert: tolerate extra spaces, tabs in insn sheetRamkumar Ramachandra, Dec 9, 2011
  6. Jonathan NiederDec 9, 2011
  7. Ramkumar RamachandraDec 9, 2011
  8. Junio C HamanoDec 9, 2011
  9. Ramkumar RamachandraDec 9, 2011
  10. 4/9 revert: simplify getting commit subject in format_todo()Ramkumar Ramachandra, Dec 9, 2011
  11. Jonathan NiederDec 9, 2011
  12. Ramkumar RamachandraDec 9, 2011
  13. 5/9 t3510 (cherry-pick-sequencer): use exit statusRamkumar Ramachandra, Dec 9, 2011
  14. Jonathan NiederDec 9, 2011
  15. Ramkumar RamachandraDec 9, 2011
  16. Jonathan NiederDec 9, 2011
  17. 6/9 t3510 (cherry-pick-sequencer): remove malformed sheet 2Ramkumar Ramachandra, Dec 9, 2011
  18. Jonathan NiederDec 9, 2011
  19. Ramkumar RamachandraDec 9, 2011
  20. Jonathan NiederDec 9, 2011
  21. 7/9 revert: allow mixed pick and revert instructionsRamkumar Ramachandra, Dec 9, 2011
  22. Jonathan NiederDec 9, 2011
  23. 8/9 revert: report fine-grained error messages from insn parserRamkumar Ramachandra, Dec 9, 2011
  24. Jonathan NiederDec 9, 2011
  25. 9/9 revert: simplify communicating command-line argumentsRamkumar Ramachandra, Dec 9, 2011
  26. Jonathan NiederDec 9, 2011
  27. Ramkumar RamachandraDec 9, 2011
  28. Jonathan NiederDec 9, 2011
  29. Ramkumar RamachandraDec 9, 2011
  30. Jonathan NiederDec 9, 2011
  31. Jonathan NiederDec 9, 2011
  32. Ramkumar RamachandraDec 9, 2011
  33. 00/10 Re-roll rr/revert-cherry-pick v3Ramkumar Ramachandra, Dec 14, 2011
  34. 01/10 revert: free msg in format_todo()Ramkumar Ramachandra, Dec 14, 2011
  35. 02/10 revert: make commit subjects in insn sheet optionalRamkumar Ramachandra, Dec 14, 2011
  36. 03/10 revert: tolerate extra spaces, tabs in insn sheetRamkumar Ramachandra, Dec 14, 2011
  37. 04/10 revert: simplify getting commit subject in format_todo()Ramkumar Ramachandra, Dec 14, 2011
  38. 05/10 t3510 (cherry-pick-sequencer): use exit statusRamkumar Ramachandra, Dec 14, 2011
  39. 06/10 t3502, t3510: clarify cherry-pick -m failureRamkumar Ramachandra, Dec 14, 2011
  40. 07/10 t3510 (cherry-pick-sequencer): remove malformed sheet 2Ramkumar Ramachandra, Dec 14, 2011
  41. 08/10 revert: move replay_action, replay_subcommand to headerRamkumar Ramachandra, Dec 14, 2011
  42. 09/10 revert: allow mixed pick and revert instructionsRamkumar Ramachandra, Dec 14, 2011
  43. 10/10 revert: report fine-grained error messages from insn parserRamkumar Ramachandra, Dec 14, 2011
  44. Junio C HamanoDec 15, 2011
  45. Ramkumar RamachandraDec 15, 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.