diff options
| -rw-r--r-- | Documentation/diff-options.txt | 3 | ||||
| -rw-r--r-- | diff.c | 4 | ||||
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 743af97b06..cbc05e8a95 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -274,10 +274,11 @@ zebra:: painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected. -dimmed_zebra:: +dimmed-zebra:: Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. + `dimmed_zebra` is a deprecated synonym. -- --word-diff[=<mode>]:: @@ -275,10 +275,12 @@ static int parse_color_moved(const char *arg) return COLOR_MOVED_ZEBRA; else if (!strcmp(arg, "default")) return COLOR_MOVED_DEFAULT; + else if (!strcmp(arg, "dimmed-zebra")) + return COLOR_MOVED_ZEBRA_DIM; else if (!strcmp(arg, "dimmed_zebra")) return COLOR_MOVED_ZEBRA_DIM; else - return error(_("color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', 'plain'")); + return error(_("color moved setting must be one of 'no', 'default', 'zebra', 'dimmed-zebra', 'plain'")); } int git_diff_ui_config(const char *var, const char *value, void *cb) 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 && |