diff options
| author |  Jeff King <peff@peff.net> | 2018-03-21 01:49:57 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-21 10:24:19 -0700 |
| commit | fbcf99e4acd666e1c4ef4304b53d96caaf0ae3f8 (patch) | |
| tree | 0a38bdb384200728843df3b6f498d3f701fd7000 /contrib | |
| parent | diff-highlight: test interleaved parallel lines of history (diff) | |
| download | tgif-fbcf99e4acd666e1c4ef4304b53d96caaf0ae3f8.tar.xz | |
diff-highlight: test graphs with --color
Our tests send git's output directly to files or pipes, so
there will never be any color. Let's do at least one --color
test to make sure that we can handle this case (which we
currently can, but will be an easy thing to mess up when we
touch the graph code in a future patch).
We'll just cover the --graph case, since this is much more
complex than the earlier cases (i.e., if it manages to
highlight, then the non-graph case definitely would).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/diff-highlight/t/t9400-diff-highlight.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh b/contrib/diff-highlight/t/t9400-diff-highlight.sh index 33bcdbc90f..bf0c270d60 100755 --- a/contrib/diff-highlight/t/t9400-diff-highlight.sh +++ b/contrib/diff-highlight/t/t9400-diff-highlight.sh @@ -264,6 +264,15 @@ test_expect_success 'diff-highlight works with the --graph option' ' test_cmp graph.exp graph.act ' +# Just reuse the previous graph test, but with --color. Our trimming +# doesn't know about color, so just sanity check that something got +# highlighted. +test_expect_success 'diff-highlight works with color graph' ' + git log --branches -p --date-order --graph --color | + "$DIFF_HIGHLIGHT" | trim_graph | left_trim >graph && + grep "\[7m" graph +' + # Most combined diffs won't meet diff-highlight's line-number filter. So we # create one here where one side drops a line and the other modifies it. That # should result in a diff like: |