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

[PATCH v3 00/12] Improve git-am test coverage

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

This is a very minor re-roll of [v2] that adds in the missing !MINGW prereq in t3901. Thanks Johannes Schindelin and Johannes Sixt for the reviews last round. Interdiff below.

Previous versions:

[v1] http://thread.gmane.org/gmane.comp.version-control.git/273254 [v2] http://thread.gmane.org/gmane.comp.version-control.git/273507

Increase test coverage of git-am.sh to help prevent regressions that could arise from the rewrite of git-am.sh to C. This patch series, along with pt/am-foreign, improved test coverage as measured by kcov from 56.5%[1] to 67.3%[2].

No tests for git-am's interactive mode, though, as test_terminal does not seem to attach a pseudo-tty to stdin(?), thus making git-am's "test -t 0" check fail.

This is part of my GSoC project to rewrite git-am.sh to a C builtin[3].

[1] http://pyokagan.github.io/git/20150430132408-a75942b//kcov-merged/git-am.eb79278e.html [2] http://pyokagan.github.io/git/20150702173751-2fdae08//kcov-merged/git-am.eb79278e.html [3] https://gist.github.com/pyokagan/1b7b0d1f4dab6ba3cef1

Paul Tan (12):
  t4150: am.messageid really adds the message id
  t4150: am fails if index is dirty
  t4151: am --abort will keep dirty index intact
  t4150: am refuses patches when paused
  t4150: am --resolved fails if index has no changes
  t4150: am --resolved fails if index has unmerged entries
  t4150: am with applypatch-msg hook
  t4150: am with pre-applypatch hook
  t4150: am with post-applypatch hook
  t4150: tests for am --[no-]scissors
  t3418: non-interactive rebase --continue with rerere enabled
  t3901: test git-am encoding conversion
 t/t3418-rebase-continue.sh |  19 ++++
 t/t3901-i18n-patch.sh      |  62 +++++++++++++
 t/t4150-am.sh              | 217 +++++++++++++++++++++++++++++++++++++++++++++
 t/t4151-am-abort.sh        |  15 ++++
 4 files changed, 313 insertions(+)
diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh
index b49bdb7..509084e 100755
--- a/t/t3901-i18n-patch.sh
+++ b/t/t3901-i18n-patch.sh
@@ -262,7 +262,7 @@ test_expect_success 'am (U/U)' '
 	check_encoding 2
 '
 
-test_expect_success 'am (L/L)' '
+test_expect_success !MINGW 'am (L/L)' '
 	# Apply ISO-8859-1 patches with ISO-8859-1 commitencoding
 	git config i18n.commitencoding ISO8859-1 &&
 	. "$TEST_DIRECTORY"/t3901-8859-1.txt &&

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