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

[PATCH 1/3] t6010-merge-base.sh: Depict the octopus test graph

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Aug 5, 2009, 07:59 UTC
Message-ID
<1249459160-3931-2-git-send-email-git@drmicha.warpmail.net>
In-Reply-To
<1249459160-3931-1-git-send-email-git@drmicha.warpmail.net>
...so that it is easier to reuse it for other tests.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 t/t6010-merge-base.sh |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh
index 04e4b7c..79124ec 100755
--- a/t/t6010-merge-base.sh
+++ b/t/t6010-merge-base.sh
@@ -110,6 +110,18 @@ test_expect_success 'compute merge-base (all)' \
 
 # Another set to demonstrate base between one commit and a merge
 # in the documentation.
+#
+# * C (MMC) * B (MMB) * A  (MMA)
+# * o       * o       * o
+# * o       * o       * o
+# * o       * o       * o
+# * o       | _______/
+# |         |/
+# |         * 1 (MM1)
+# | _______/
+# |/
+# * root (MMR)
+
 
 test_expect_success 'merge-base for octopus-step (setup)' '
 	test_tick && git commit --allow-empty -m root && git tag MMR &&
-- 
1.6.4.70.g9c084
Previous: Michael J GruberNext: Michael J Gruber
Message 2 of 4 in “git-merge-base -a vs. git-show-branch --merge-base”
  1. 0/3 git-merge-base -a vs. git-show-branch --merge-baseMichael J Gruber, Aug 5, 2009
  2. 1/3 t6010-merge-base.sh: Depict the octopus test graphMichael J Gruber, Aug 5, 2009
  3. 2/3 git-merge-base/git-show-branch: Cleanup documentation and usageMichael J Gruber, Aug 5, 2009
  4. 3/3 git-merge-base/git-show-branch --merge-base: Documentation and testMichael J Gruber, Aug 5, 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.