On Tue, 24 Apr 2018 14:03:28 -0700 Stefan Beller <sbeller@xxxxxxxxxx> wrote: > Suggested-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> > (https://public-inbox.org/git/87o9j0uljo.fsf@xxxxxxxxxxxxxxxxxxx/) > Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> Firstly, I don't know if this is the right solution- as written in the linked e-mail [1], the issue might be more that the config conflates 2 unrelated things, not that a certain intersection is missing. [1] https://public-inbox.org/git/87muykuij7.fsf@xxxxxxxxxxxxxxxxxxx/ Optional: Probably better to put the link inline, instead of in the trailer. > -test_expect_success 'detect permutations inside moved code -- dimmed_zebra' ' > +test_expect_success 'detect blocks of moved code' ' > git reset --hard && > cat <<-\EOF >lines.txt && > long line 1 > @@ -1271,6 +1271,52 @@ 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" && Add a comment here explaining that these colors do not appear in the output, but merely set to recognizable values to ensure that they do not appear in the output. > + > + git diff HEAD --no-renames --color-moved=blocks --color | > + grep -v "index" | > + test_decode_color >actual && > + cat <<-\EOF >expected && > + <BOLD>diff --git a/lines.txt b/lines.txt<RESET> > + <BOLD>--- a/lines.txt<RESET> > + <BOLD>+++ b/lines.txt<RESET> > + <CYAN>@@ -1,16 +1,16 @@<RESET> > + <MAGENTA>-long line 1<RESET> > + <MAGENTA>-long line 2<RESET> > + <MAGENTA>-long line 3<RESET> > + line 4<RESET> > + line 5<RESET> > + line 6<RESET> > + line 7<RESET> > + line 8<RESET> > + line 9<RESET> > + <CYAN>+<RESET><CYAN>long line 1<RESET> > + <CYAN>+<RESET><CYAN>long line 2<RESET> > + <CYAN>+<RESET><CYAN>long line 3<RESET> > + <CYAN>+<RESET><CYAN>long line 14<RESET> > + <CYAN>+<RESET><CYAN>long line 15<RESET> > + <CYAN>+<RESET><CYAN>long line 16<RESET> > + line 10<RESET> > + line 11<RESET> > + line 12<RESET> > + line 13<RESET> > + <MAGENTA>-long line 14<RESET> > + <MAGENTA>-long line 15<RESET> > + <MAGENTA>-long line 16<RESET> > + EOF > + test_cmp expected actual > + > +' [snip]
