diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2018-07-24 17:58:45 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-25 14:23:52 -0700 |
| commit | e3f2f5f9cd9238ae106434278d325eada2719842 (patch) | |
| tree | 8959c32d009a921bcb842d06e7c3ebaeb09f49ef /t/t4015-diff-whitespace.sh | |
| parent | Git 2.16.4 (diff) | |
| download | tgif-e3f2f5f9cd9238ae106434278d325eada2719842.tar.xz | |
diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"
The --color-moved "dimmed_zebra" mode (with an underscore) is an
anachronism. Most options and modes are hyphenated. It is more difficult
to type and somewhat more difficult to read than those which are
hyphenated. Therefore, rename it to "dimmed-zebra", and nominally
deprecate "dimmed_zebra".
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4015-diff-whitespace.sh')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 17df491a3a..8cdfa225ef 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -1223,7 +1223,7 @@ test_expect_success 'plain moved code, inside file' ' test_cmp expected actual ' -test_expect_success 'detect permutations inside moved code -- dimmed_zebra' ' +test_expect_success 'detect permutations inside moved code -- dimmed-zebra' ' git reset --hard && cat <<-\EOF >lines.txt && long line 1 @@ -1271,7 +1271,7 @@ test_expect_success 'detect permutations inside moved code -- dimmed_zebra' ' test_config color.diff.newMovedDimmed "normal cyan" && test_config color.diff.oldMovedAlternativeDimmed "normal blue" && test_config color.diff.newMovedAlternativeDimmed "normal yellow" && - git diff HEAD --no-renames --color-moved=dimmed_zebra --color | + git diff HEAD --no-renames --color-moved=dimmed-zebra --color | grep -v "index" | test_decode_color >actual && cat <<-\EOF >expected && |