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

[PATCH v3 06/12] t4150: am --resolved fails if index has unmerged entries

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

Since c1d1128 (git-am --resolved: more usable error message., 2006-04-28), git-am --resolved will check to see if there are any unmerged entries, and will error out with a user-friendly error message if there are.

Add a test for this.
Reviewed-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
 t/t4150-am.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 430ae71..c1ec4d5 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -437,6 +437,19 @@ test_expect_success 'am --resolved fails if index has no changes' '
 	test_cmp_rev lorem2^^ HEAD
 '
 
+test_expect_success 'am --resolved fails if index has unmerged entries' '
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout second &&
+	test_must_fail git am -3 lorem-move.patch &&
+	test_path_is_dir .git/rebase-apply &&
+	test_cmp_rev second HEAD &&
+	test_must_fail git am --resolved >err &&
+	test_path_is_dir .git/rebase-apply &&
+	test_cmp_rev second HEAD &&
+	test_i18ngrep "still have unmerged paths" err
+'
+
 test_expect_success 'am takes patches from a Pine mailbox' '
 	rm -fr .git/rebase-apply &&
 	git reset --hard &&

-- 
2.5.0.rc2.110.gf2a5fc6
Previous: Paul TanNext: Paul Tan
Message 7 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.