kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rs/diff-color-moved-w-no-ext-diff-fix' 

"git diff --no-ext-diff" when diff.external is configured ignored
the "--color-moved" option.

* rs/diff-color-moved-w-no-ext-diff-fix:
  diff: allow --color-moved with --no-ext-diff
maint
Junio C Hamano 2024-07-02 09:59:02 -07:00
parent ca349c387b 0f4b0d4cf0
commit 2d97b4e235
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diff.c
View File

@ -4968,7 +4968,8 @@ void diff_setup_done(struct diff_options *options)
if (options->flags.follow_renames) if (options->flags.follow_renames)
diff_check_follow_pathspec(&options->pathspec, 1); diff_check_follow_pathspec(&options->pathspec, 1);


if (!options->use_color || external_diff()) if (!options->use_color ||
(options->flags.allow_external && external_diff()))
options->color_moved = 0; options->color_moved = 0;


if (options->filter_not) { if (options->filter_not) {

9
t/t4015-diff-whitespace.sh
View File

@ -1184,6 +1184,15 @@ test_expect_success 'detect moved code, complete file' '
test_cmp expected actual test_cmp expected actual
' '


test_expect_success '--color-moved with --no-ext-diff' '
test_config color.diff.oldMoved "yellow" &&
test_config color.diff.newMoved "blue" &&
args="--color --color-moved=zebra --no-renames HEAD" &&
git diff $args >expect &&
git -c diff.external=echo diff --no-ext-diff $args >actual &&
test_cmp expect actual
'

test_expect_success 'detect malicious moved code, inside file' ' test_expect_success 'detect malicious moved code, inside file' '
test_config color.diff.oldMoved "normal red" && test_config color.diff.oldMoved "normal red" &&
test_config color.diff.newMoved "normal green" && test_config color.diff.newMoved "normal green" &&