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

[PATCH 2/3] Add test for commit --dry-run --short.

From
SSStephen P. Smith <ischis2@cox.net>
Date
Aug 31, 2018, 05:39 UTC
Message-ID
<20180831053921.8083-3-ischis2@cox.net>
In-Reply-To
<20180831053921.8083-1-ischis2@cox.net>

Add test for commit with --dry-run --short for a new file of zero length.

The test demonstrated that the setting of the commitable flag was broken as was found durning an earlier patch review.

Signed-off-by: Stephen P. Smith <ischis2@cox.net>
---
 t/t7501-commit.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 810d4cea7..fc69da816 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -682,4 +682,14 @@ test_expect_success '--dry-run with conflicts fixed from a merge' '
 	git commit -m "conflicts fixed from merge."
 '
 
+test_expect_success '--dry-run --short with conflicts fixed from a merge' '
+	# setup two branches with conflicting information
+	# in the same file, resolve the conflict,
+	# call commit with --dry-run --short
+	rm -f test-file &&
+	touch testfile &&
+	git add test-file &&
+	git commit --dry-run --short
+'
+
 test_done
-- 
2.18.0
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 4 of 12 in “wt-status.c: commitable flag”
  1. 0/3 wt-status.c: commitable flagStephen P. Smith, Aug 31, 2018
  2. 1/3 Change tests from expecting to fail to expecting success.Stephen P. Smith, Aug 31, 2018
  3. Ævar Arnfjörð BjarmasonAug 31, 2018
  4. 2/3 Add test for commit --dry-run --short.Stephen P. Smith, Aug 31, 2018
  5. Ævar Arnfjörð BjarmasonAug 31, 2018
  6. Junio C HamanoAug 31, 2018
  7. Stephen & Linda SmithAug 31, 2018
  8. SZEDER GáborSep 1, 2018
  9. 3/3 wt-status.c: Set the commitable flag in the collect phase.Stephen P. Smith, Aug 31, 2018
  10. Ævar Arnfjörð BjarmasonAug 31, 2018
  11. Junio C HamanoAug 31, 2018
  12. Stephen & Linda SmithAug 31, 2018

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.