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

[BUG/PATCH 2/5] t4214: use test_merge

From
Denton Liu <liu.denton@gmail.com>
Date
Sep 25, 2019, 10:27 UTC
Message-ID
<4a93deb3f62088b9bdb615adfb126581659914b4.1569407150.git.liu.denton@gmail.com>
In-Reply-To
<cover.1569407150.git.liu.denton@gmail.com>

In the previous commit, we extended test_merge() so that it could perform octopus merges. Now that the restriction is lifted, use test_merge() to perform the octopus merge instead of manually duplicating test_merge() functionality.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
 t/t4214-log-graph-octopus.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/t/t4214-log-graph-octopus.sh b/t/t4214-log-graph-octopus.sh
index dab96c89aa..f6e22ec825 100755
--- a/t/t4214-log-graph-octopus.sh
+++ b/t/t4214-log-graph-octopus.sh
@@ -41,8 +41,7 @@ test_expect_success 'set up merge history' '
 		test_commit $i $i $i tag$i || return $?
 	done &&
 	git checkout 1 -b merge &&
-	test_tick &&
-	git merge -m octopus-merge 1 2 3 4 &&
+	test_merge octopus-merge 1 2 3 4 &&
 	git checkout 1 -b L &&
 	test_commit left
 '

-- 
2.23.0.248.g3a9dd8fb08
Previous: Denton LiuNext: Denton Liu
Message 3 of 16 in “t4214: cleanup and demonstrate graph bug”
  1. 0/5 t4214: cleanup and demonstrate graph bugDenton Liu, Sep 25, 2019
  2. 1/5 test-lib: let test_merge() perform octopus mergesDenton Liu, Sep 25, 2019
  3. 2/5 t4214: use test_mergeDenton Liu, Sep 25, 2019
  4. 3/5 t4214: generate expect in their own test casesDenton Liu, Sep 25, 2019
  5. 4/5 t4214: explicitly list tags in logDenton Liu, Sep 25, 2019
  6. 5/5 t4214: demonstrate octopus graph coloring failureDenton Liu, Sep 25, 2019
  7. Denton LiuSep 25, 2019
  8. Jeff KingSep 26, 2019
  9. Junio C HamanoOct 3, 2019
  10. 0/5 t4214: cleanup and demonstrate graph bugDenton Liu, Oct 4, 2019
  11. 1/5 test-lib: let test_merge() perform octopus mergesDenton Liu, Oct 4, 2019
  12. 4/5 t4214: explicitly list tags in logDenton Liu, Oct 4, 2019
  13. 2/5 t4214: use test_mergeDenton Liu, Oct 4, 2019
  14. 3/5 t4214: generate expect in their own test casesDenton Liu, Oct 4, 2019
  15. 5/5 t4214: demonstrate octopus graph coloring failureDenton Liu, Oct 4, 2019
  16. Junio C HamanoOct 4, 2019

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.