(command.CommandList children: [ (command.ShAssignment pairs: [ (assign_pair lhs: (sh_lhs_expr.Name name:test_description) op: assign_op.Equal rhs: {(SQ <'Test rename detection in diff engine.\n'> <'\n'>)} spids: [13] ) ] ) (C {<.>} {<'./test-lib.sh'>}) (C {<.>} {(DQ ($ Id.VSub_DollarName '$TEST_DIRECTORY')) <'/diff-lib.sh'>}) (C {<test_expect_success>} {(SQ <setup>)} { (SQ <'\n'> <'\tcat >path0 <<-\\EOF &&\n'> <'\tLine 1\n'> <'\tLine 2\n'> <'\tLine 3\n'> <'\tLine 4\n'> <'\tLine 5\n'> <'\tLine 6\n'> <'\tLine 7\n'> <'\tLine 8\n'> <'\tLine 9\n'> <'\tLine 10\n'> <'\tline 11\n'> <'\tLine 12\n'> <'\tLine 13\n'> <'\tLine 14\n'> <'\tLine 15\n'> <'\tEOF\n'> <'\tcat >expected <<-\\EOF &&\n'> <'\tdiff --git a/path0 b/path1\n'> <'\trename from path0\n'> <'\trename to path1\n'> <'\t--- a/path0\n'> <'\t+++ b/path1\n'> <'\t@@ -8,7 +8,7 @@ Line 7\n'> <'\t Line 8\n'> <'\t Line 9\n'> <'\t Line 10\n'> <'\t-line 11\n'> <'\t+Line 11\n'> <'\t Line 12\n'> <'\t Line 13\n'> <'\t Line 14\n'> <'\tEOF\n'> <'\tcat >no-rename <<-\\EOF\n'> <'\tdiff --git a/path0 b/path0\n'> <'\tdeleted file mode 100644\n'> <'\tindex fdbec44..0000000\n'> <'\t--- a/path0\n'> <'\t+++ /dev/null\n'> <'\t@@ -1,15 +0,0 @@\n'> <'\t-Line 1\n'> <'\t-Line 2\n'> <'\t-Line 3\n'> <'\t-Line 4\n'> <'\t-Line 5\n'> <'\t-Line 6\n'> <'\t-Line 7\n'> <'\t-Line 8\n'> <'\t-Line 9\n'> <'\t-Line 10\n'> <'\t-line 11\n'> <'\t-Line 12\n'> <'\t-Line 13\n'> <'\t-Line 14\n'> <'\t-Line 15\n'> <'\tdiff --git a/path1 b/path1\n'> <'\tnew file mode 100644\n'> <'\tindex 0000000..752c50e\n'> <'\t--- /dev/null\n'> <'\t+++ b/path1\n'> <'\t@@ -0,0 +1,15 @@\n'> <'\t+Line 1\n'> <'\t+Line 2\n'> <'\t+Line 3\n'> <'\t+Line 4\n'> <'\t+Line 5\n'> <'\t+Line 6\n'> <'\t+Line 7\n'> <'\t+Line 8\n'> <'\t+Line 9\n'> <'\t+Line 10\n'> <'\t+Line 11\n'> <'\t+Line 12\n'> <'\t+Line 13\n'> <'\t+Line 14\n'> <'\t+Line 15\n'> <'\tEOF\n'> ) } ) (C {<test_expect_success>} {(SQ <'update-index --add a file.'>)} {(SQ <'git update-index --add path0'>)} ) (C {<test_expect_success>} {(SQ <'write that tree.'>)} {(SQ <'tree=$(git write-tree) && echo $tree'>)} ) (command.Simple words: [{<sed>} {<-e>} {(SQ <'s/line/Line/'>)}] redirects: [ (redir op:<Id.Redir_Less '<'> loc:(redir_loc.Fd fd:0) arg:{<path0>}) (redir op:<Id.Redir_Great '>'> loc:(redir_loc.Fd fd:1) arg:{<path1>}) ] do_fork: T ) (C {<rm>} {<-f>} {<path0>}) (C {<test_expect_success>} {(SQ <'renamed and edited the file.'>)} {(SQ <'git update-index --add --remove path0 path1'>)} ) (C {<test_expect_success>} {(SQ <'git diff-index -p -M after rename and editing.'>)} {(SQ <'git diff-index -p -M $tree >current'>)} ) (C {<test_expect_success>} {(SQ <'validate the output.'>)} {(SQ <'compare_diff_patch current expected'>)} ) (C {<test_expect_success>} {(SQ <'test diff.renames=true'>)} { (SQ <'\n'> <'\tgit -c diff.renames=true diff --cached $tree >current &&\n'> <'\tcompare_diff_patch current expected\n'> ) } ) (C {<test_expect_success>} {(SQ <'test diff.renames=false'>)} { (SQ <'\n'> <'\tgit -c diff.renames=false diff --cached $tree >current &&\n'> <'\tcompare_diff_patch current no-rename\n'> ) } ) (C {<test_expect_success>} {(SQ <'test diff.renames unset'>)} { (SQ <'\n'> <'\tgit diff --cached $tree >current &&\n'> <'\tcompare_diff_patch current expected\n'> ) } ) (C {<test_expect_success>} {(SQ <'favour same basenames over different ones'>)} { (SQ <'\n'> <'\tcp path1 another-path &&\n'> <'\tgit add another-path &&\n'> <'\tgit commit -m 1 &&\n'> <'\tgit rm path1 &&\n'> <'\tmkdir subdir &&\n'> <'\tgit mv another-path subdir/path1 &&\n'> <'\tgit status | test_i18ngrep "renamed: .*path1 -> subdir/path1"'> ) } ) (C {<test_expect_success>} {(SQ <'favour same basenames even with minor differences'>)} { (SQ <'\n'> <'\tgit show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&\n'> <'\tgit status | test_i18ngrep "renamed: .*path1 -> subdir/path1"'> ) } ) (C {<test_expect_success>} {(SQ <'two files with same basename and same content'>)} { (SQ <'\n'> <'\tgit reset --hard &&\n'> <'\tmkdir -p dir/A dir/B &&\n'> <'\tcp path1 dir/A/file &&\n'> <'\tcp path1 dir/B/file &&\n'> <'\tgit add dir &&\n'> <'\tgit commit -m 2 &&\n'> <'\tgit mv dir other-dir &&\n'> <'\tgit status | test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file"\n'> ) } ) (C {<test_expect_success>} {(SQ <'setup for many rename source candidates'>)} { (SQ <'\n'> <'\tgit reset --hard &&\n'> <'\tfor i in 0 1 2 3 4 5 6 7 8 9;\n'> <'\tdo\n'> <'\t\tfor j in 0 1 2 3 4 5 6 7 8 9;\n'> <'\t\tdo\n'> <'\t\t\techo "$i$j" >"path$i$j"\n'> <'\t\tdone\n'> <'\tdone &&\n'> <'\tgit add "path??" &&\n'> <'\ttest_tick &&\n'> <'\tgit commit -m "hundred" &&\n'> <'\t(cat path1; echo new) >new-path &&\n'> <'\techo old >>path1 &&\n'> <'\tgit add new-path path1 &&\n'> <'\tgit diff -l 4 -C -C --cached --name-status >actual 2>actual.err &&\n'> <'\tsed -e "s/^\\([CM]\\)[0-9]*\t/\\1\t/" actual >actual.munged &&\n'> <'\tcat >expect <<-EOF &&\n'> <'\tC\tpath1\tnew-path\n'> <'\tM\tpath1\n'> <'\tEOF\n'> <'\ttest_cmp expect actual.munged &&\n'> <'\tgrep warning actual.err\n'> ) } ) (C {<test_expect_success>} {(SQ <'rename pretty print with nothing in common'>)} { (SQ <'\n'> <'\tmkdir -p a/b/ &&\n'> <'\t: >a/b/c &&\n'> <'\tgit add a/b/c &&\n'> <'\tgit commit -m "create a/b/c" &&\n'> <'\tmkdir -p c/b/ &&\n'> <'\tgit mv a/b/c c/b/a &&\n'> <'\tgit commit -m "a/b/c -> c/b/a" &&\n'> <'\tgit diff -M --summary HEAD^ HEAD >output &&\n'> <'\ttest_i18ngrep " a/b/c => c/b/a " output &&\n'> <'\tgit diff -M --stat HEAD^ HEAD >output &&\n'> <'\ttest_i18ngrep " a/b/c => c/b/a " output\n'> ) } ) (C {<test_expect_success>} {(SQ <'rename pretty print with common prefix'>)} { (SQ <'\n'> <'\tmkdir -p c/d &&\n'> <'\tgit mv c/b/a c/d/e &&\n'> <'\tgit commit -m "c/b/a -> c/d/e" &&\n'> <'\tgit diff -M --summary HEAD^ HEAD >output &&\n'> <'\ttest_i18ngrep " c/{b/a => d/e} " output &&\n'> <'\tgit diff -M --stat HEAD^ HEAD >output &&\n'> <'\ttest_i18ngrep " c/{b/a => d/e} " output\n'> ) } ) (C {<test_expect_success>} {(SQ <'rename pretty print with common suffix'>)} { (SQ <'\n'> <'\tmkdir d &&\n'> <'\tgit mv c/d/e d/e &&\n'> <'\tgit commit -m "c/d/e -> d/e" &&\n'> <'\tgit diff -M --summary HEAD^ HEAD >output &&\n'> <'\ttest_i18ngrep " {c/d => d}/e " output &&\n'> <'\tgit diff -M --stat HEAD^ HEAD >output &&\n'> <'\ttest_i18ngrep " {c/d => d}/e " output\n'> ) } ) (C {<test_expect_success>} {(SQ <'rename pretty print with common prefix and suffix'>)} { (SQ <'\n'> <'\tmkdir d/f &&\n'> <'\tgit mv d/e d/f/e &&\n'> <'\tgit commit -m "d/e -> d/f/e" &&\n'> <'\tgit diff -M --summary HEAD^ HEAD >output &&\n'> <'\ttest_i18ngrep " d/{ => f}/e " output &&\n'> <'\tgit diff -M --stat HEAD^ HEAD >output &&\n'> <'\ttest_i18ngrep " d/{ => f}/e " output\n'> ) } ) (C {<test_expect_success>} {(SQ <'rename pretty print common prefix and suffix overlap'>)} { (SQ <'\n'> <'\tmkdir d/f/f &&\n'> <'\tgit mv d/f/e d/f/f/e &&\n'> <'\tgit commit -m "d/f/e d/f/f/e" &&\n'> <'\tgit diff -M --summary HEAD^ HEAD >output &&\n'> <'\ttest_i18ngrep " d/f/{ => f}/e " output &&\n'> <'\tgit diff -M --stat HEAD^ HEAD >output &&\n'> <'\ttest_i18ngrep " d/f/{ => f}/e " output\n'> ) } ) (C {<test_done>}) ] )