global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-21 22:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sb/diff-color-move'

Browse Source 
A recently added "--color-moved" feature of "diff" fell into
infinite loop when ignoring whitespace changes, which has been
fixed.

* sb/diff-color-move:
  diff: fix infinite loop with --color-moved --ignore-space-change
This commit is contained in:
Junio C Hamano
2017-10-17 13:29:19 +09:00
parent d1114d87c7 fa5ba2c1dd
commit 91ccfb8517
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1530,4 +1530,13 @@ test_expect_success 'move detection with submodules' '
test_cmp expect decoded_actual
'
test_expect_success 'move detection with whitespace changes' '
test_when_finished "git reset --hard" &&
test_seq 10 >test &&
git add test &&
sed s/3/42/ <test >test.tmp &&
mv test.tmp test &&
git -c diff.colormoved diff --ignore-space-change -- test
'
test_done