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

[PATCH v3 11/12] t3418: non-interactive rebase --continue with rerere enabled

From
Paul Tan <pyokagan@gmail.com>
Date
Jul 19, 2015, 15:49 UTC
Message-ID
<1437320958-11192-12-git-send-email-pyokagan@gmail.com>
In-Reply-To
<1437320958-11192-1-git-send-email-pyokagan@gmail.com>

Since 8389b52 (git-rerere: reuse recorded resolve., 2006-01-28), git-am will call git-rerere to re-use recorded merge conflict resolutions if any occur in a threeway merge.

Add a test to ensure that git-rerere is called by git-am (which handles the non-interactive rebase).

Reviewed-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
 t/t3418-rebase-continue.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index 2680375..4428b90 100755
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -40,6 +40,25 @@ test_expect_success 'non-interactive rebase --continue works with touched file'
 	git rebase --continue
 '
 
+test_expect_success 'non-interactive rebase --continue with rerere enabled' '
+	test_config rerere.enabled true &&
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git reset --hard commit-new-file-F2-on-topic-branch &&
+	git checkout master &&
+	rm -fr .git/rebase-* &&
+
+	test_must_fail git rebase --onto master master topic &&
+	echo "Resolved" >F2 &&
+	git add F2 &&
+	cp F2 F2.expected &&
+	git rebase --continue &&
+
+	git reset --hard commit-new-file-F2-on-topic-branch &&
+	git checkout master &&
+	test_must_fail git rebase --onto master master topic &&
+	test_cmp F2.expected F2
+'
+
 test_expect_success 'rebase --continue can not be used with other options' '
 	test_must_fail git rebase -v --continue &&
 	test_must_fail git rebase --continue -v

-- 
2.5.0.rc2.110.gf2a5fc6
Previous: Paul TanNext: Paul Tan
Message 12 of 13 in “Improve git-am test coverage”
  1. 00/12 Improve git-am test coveragePaul Tan, Jul 19, 2015
  2. 01/12 t4150: am.messageid really adds the message idPaul Tan, Jul 19, 2015
  3. 02/12 t4150: am fails if index is dirtyPaul Tan, Jul 19, 2015
  4. 03/12 t4151: am --abort will keep dirty index intactPaul Tan, Jul 19, 2015
  5. 04/12 t4150: am refuses patches when pausedPaul Tan, Jul 19, 2015
  6. 05/12 t4150: am --resolved fails if index has no changesPaul Tan, Jul 19, 2015
  7. 06/12 t4150: am --resolved fails if index has unmerged entriesPaul Tan, Jul 19, 2015
  8. 07/12 t4150: am with applypatch-msg hookPaul Tan, Jul 19, 2015
  9. 08/12 t4150: am with pre-applypatch hookPaul Tan, Jul 19, 2015
  10. 09/12 t4150: am with post-applypatch hookPaul Tan, Jul 19, 2015
  11. 10/12 t4150: tests for am --[no-]scissorsPaul Tan, Jul 19, 2015
  12. 11/12 t3418: non-interactive rebase --continue with rerere enabledPaul Tan, Jul 19, 2015
  13. 12/12 t3901: test git-am encoding conversionPaul Tan, Jul 19, 2015

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.