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

[PATCH v2 4/8] Test log --graph

From
Thomas Rast <trast@student.ethz.ch>
Date
Feb 19, 2009, 11:13 UTC
Message-ID
<a6cc1b8844a60fc5284ac8e6b93658a041f6bfeb.1235041345.git.trast@student.ethz.ch>
In-Reply-To
<cover.1235041345.git.trast@student.ethz.ch>
So far there were no tests checking that log --graph actually works.

Note that the tests strip trailing whitespace, as the current --graph emits trailing whitespace on lines that do not contain anything but graph lines.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
Same as v1.
 t/t4202-log.sh |  148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 148 insertions(+), 0 deletions(-)
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 7b976ee..93966f7 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -134,5 +134,153 @@ test_expect_success 'log --grep -i' '
 	test_cmp expect actual
 '
 
+cat > expect <<EOF
+* Second
+* sixth
+* fifth
+* fourth
+* third
+* second
+* initial
+EOF
+
+test_expect_success 'simple log --graph' '
+	git log --graph --pretty=tformat:%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'set up merge history' '
+	git checkout -b side HEAD~4 &&
+	test_commit side-1 1 1 &&
+	test_commit side-2 2 2 &&
+	git checkout master &&
+	git merge side
+'
+
+cat > expect <<\EOF
+*   Merge branch 'side'
+|\
+| * side-2
+| * side-1
+* | Second
+* | sixth
+* | fifth
+* | fourth
+|/
+* third
+* second
+* initial
+EOF
+
+test_expect_success 'log --graph with merge' '
+	git log --graph --date-order --pretty=tformat:%s |
+		sed "s/ *$//" >actual &&
+	test_cmp expect actual
+'
+
+cat > expect <<\EOF
+*   commit master
+|\  Merge: A B
+| | Author: A U Thor <author@example.com>
+| |
+| |     Merge branch 'side'
+| |
+| * commit side
+| | Author: A U Thor <author@example.com>
+| |
+| |     side-2
+| |
+| * commit tags/side-1
+| | Author: A U Thor <author@example.com>
+| |
+| |     side-1
+| |
+* | commit master~1
+| | Author: A U Thor <author@example.com>
+| |
+| |     Second
+| |
+* | commit master~2
+| | Author: A U Thor <author@example.com>
+| |
+| |     sixth
+| |
+* | commit master~3
+| | Author: A U Thor <author@example.com>
+| |
+| |     fifth
+| |
+* | commit master~4
+|/  Author: A U Thor <author@example.com>
+|
+|       fourth
+|
+* commit tags/side-1~1
+| Author: A U Thor <author@example.com>
+|
+|     third
+|
+* commit tags/side-1~2
+| Author: A U Thor <author@example.com>
+|
+|     second
+|
+* commit tags/side-1~3
+  Author: A U Thor <author@example.com>
+
+      initial
+EOF
+
+test_expect_success 'log --graph with full output' '
+	git log --graph --date-order --pretty=short |
+		git name-rev --name-only --stdin |
+		sed "s/Merge:.*/Merge: A B/;s/ *$//" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'set up more tangled history' '
+	git checkout -b tangle HEAD~6 &&
+	test_commit tangle-a tangle-a a &&
+	git merge master~3 &&
+	git merge side~1 &&
+	git checkout master &&
+	git merge tangle
+'
+
+cat > expect <<\EOF
+*   Merge branch 'tangle'
+|\
+| *   Merge branch 'side' (early part) into tangle
+| |\
+| * \   Merge branch 'master' (early part) into tangle
+| |\ \
+| * | | tangle-a
+* | | |   Merge branch 'side'
+|\ \ \ \
+| * | | | side-2
+| | | |/
+| | |/|
+| |/| |
+| * | | side-1
+* | | | Second
+* | | | sixth
+| | |/
+| |/|
+|/| |
+* | | fifth
+* | | fourth
+|/ /
+* | third
+|/
+* second
+* initial
+EOF
+
+test_expect_success 'log --graph with merge' '
+	git log --graph --date-order --pretty=tformat:%s |
+		sed "s/ *$//" >actual &&
+	test_cmp expect actual
+'
+
 test_done
 

-- 
1.6.2.rc1.266.gce6c4
Previous: Thomas RastNext: Thomas Rast
Message 6 of 19 in “What's cooking in git.git (Feb 2009, #06; Wed, 18)”
  1. Junio C HamanoFeb 19, 2009
  2. 0/8 Support coverage testing with GCC/gcovThomas Rast, Feb 19, 2009
  3. 1/8 Support coverage testing with GCC/gcovThomas Rast, Feb 19, 2009
  4. 2/8 Test that diff can read from stdinThomas Rast, Feb 19, 2009
  5. 3/8 Test diff --dirstat functionalityThomas Rast, Feb 19, 2009
  6. 4/8 Test log --graphThomas Rast, Feb 19, 2009
  7. 5/8 Test fsck a bit harderThomas Rast, Feb 19, 2009
  8. Test fsck a bit harderThomas Rast, Feb 20, 2009
  9. Johannes SixtFeb 20, 2009
  10. Test fsck a bit harderThomas Rast, Feb 21, 2009
  11. Johannes SixtFeb 21, 2009
  12. Test fsck a bit harderThomas Rast, Mar 1, 2009
  13. Junio C HamanoMar 3, 2009
  14. 6/8 Test log --decorateThomas Rast, Feb 19, 2009
  15. 7/8 Test rev-list --parents/--childrenThomas Rast, Feb 19, 2009
  16. 8/8 Test git-patch-idThomas Rast, Feb 19, 2009
  17. Johannes SchindelinFeb 19, 2009
  18. Thomas RastFeb 19, 2009
  19. Sverre RabbelierFeb 19, 2009

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.