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

[PATCH v3 03/12] t4151: am --abort will keep dirty index intact

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

Since 7b3b7e3 (am --abort: keep unrelated commits since the last failure and warn, 2010-12-21), git-am --abort will not touch the index if on the previous invocation, git-am failed because the index is dirty. This is to ensure that the user's modifications to the index are not discarded.

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/t4151-am-abort.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 833e7b2..05bdc3e 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -95,6 +95,21 @@ test_expect_success 'am --abort will keep the local commits intact' '
 	test_cmp expect actual
 '
 
+test_expect_success 'am --abort will keep dirty index intact' '
+	git reset --hard initial &&
+	echo dirtyfile >dirtyfile &&
+	cp dirtyfile dirtyfile.expected &&
+	git add dirtyfile &&
+	test_must_fail git am 0001-*.patch &&
+	test_cmp_rev initial HEAD &&
+	test_path_is_file dirtyfile &&
+	test_cmp dirtyfile.expected dirtyfile &&
+	git am --abort &&
+	test_cmp_rev initial HEAD &&
+	test_path_is_file dirtyfile &&
+	test_cmp dirtyfile.expected dirtyfile
+'
+
 test_expect_success 'am -3 stops on conflict on unborn branch' '
 	git checkout -f --orphan orphan &&
 	git reset &&

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