From: Brian Henderson <henderson.bj@gmail.com>
Date: Thu, 04 Aug 2016 15:02:38 GMT
Subject: [PATCH] diff-highlight: Add comment for our assumption about --graph output.
Message-ID: <20160804150238.26658-1-henderson.bj@gmail.com>
In-Reply-To: <xmqqk2g0l8a6.fsf@gitster.mtv.corp.google.com>

---
 contrib/diff-highlight/diff-highlight | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/diff-highlight/diff-highlight b/contrib/diff-highlight/diff-highlight
index ec31356..9364423 100755
--- a/contrib/diff-highlight/diff-highlight
+++ b/contrib/diff-highlight/diff-highlight
@@ -20,6 +20,9 @@ my @NEW_HIGHLIGHT = (
 my $RESET = "\x1b[m";
 my $COLOR = qr/\x1b\[[0-9;]*m/;
 my $BORING = qr/$COLOR|\s/;
+
+# The patch portion of git log -p --graph should only ever have preceding | and
+# not / or \ as merge history only shows up on the commit line.
 my $GRAPH = qr/$COLOR?\|$COLOR?\s+/;
 
 my @removed;
-- 
2.9.0