From: Jeff King <peff@peff.net>
To: phillip.wood@dunelm.org.uk
Cc: Brian Henderson <henderson.bj@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: [PATCH 1/7] diff-highlight: correct test graph diagram
Date: Wed, 21 Mar 2018 01:47:45 -0400 [thread overview]
Message-ID: <20180321054744.GA14016@sigill.intra.peff.net> (raw)
In-Reply-To: <20180321054718.GA13936@sigill.intra.peff.net>
We actually branch "A" off of "D". The sample "--graph"
output is right, but the left-to-right diagram is
misleading. Let's fix it.
Signed-off-by: Jeff King <peff@peff.net>
---
contrib/diff-highlight/t/t9400-diff-highlight.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh b/contrib/diff-highlight/t/t9400-diff-highlight.sh
index 3b43dbed74..bf62f036c7 100755
--- a/contrib/diff-highlight/t/t9400-diff-highlight.sh
+++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh
@@ -52,8 +52,8 @@ test_strip_patch_header () {
# dh_test_setup_history generates a contrived graph such that we have at least
# 1 nesting (E) and 2 nestings (F).
#
-# A branch
-# /
+# A branch
+# /
# D---E---F master
#
# git log --all --graph
--
2.17.0.rc0.402.ged0b3fd1ee
next prev parent reply other threads:[~2018-03-21 5:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-19 10:21 [BUG] log --graph corrupts patch Phillip Wood
2018-03-20 6:09 ` Jeff King
2018-03-20 9:58 ` Phillip Wood
2018-03-20 15:58 ` Jeff King
2018-03-21 5:47 ` Jeff King
2018-03-21 5:47 ` Jeff King [this message]
2018-03-21 5:48 ` [PATCH 2/7] diff-highlight: use test_tick in graph test Jeff King
2018-03-21 5:48 ` [PATCH 3/7] diff-highlight: prefer "echo" to "cat" in tests Jeff King
2018-03-21 5:49 ` [PATCH 4/7] diff-highlight: test interleaved parallel lines of history Jeff King
2018-03-21 5:49 ` [PATCH 5/7] diff-highlight: test graphs with --color Jeff King
2018-03-21 5:56 ` [PATCH 6/7] diff-highlight: use flush() helper consistently Jeff King
2018-03-21 5:59 ` [PATCH 7/7] diff-highlight: detect --graph by indent Jeff King
2018-03-22 10:59 ` Phillip Wood
2018-03-22 11:18 ` Jeff King
2018-03-21 17:23 ` [BUG] log --graph corrupts patch Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180321054744.GA14016@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=henderson.bj@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).