From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b --- third_party/git/t/t4001-diff-rename.sh | 265 --------------------------------- 1 file changed, 265 deletions(-) delete mode 100755 third_party/git/t/t4001-diff-rename.sh (limited to 'third_party/git/t/t4001-diff-rename.sh') diff --git a/third_party/git/t/t4001-diff-rename.sh b/third_party/git/t/t4001-diff-rename.sh deleted file mode 100755 index c16486a9d41a..000000000000 --- a/third_party/git/t/t4001-diff-rename.sh +++ /dev/null @@ -1,265 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2005 Junio C Hamano -# - -test_description='Test rename detection in diff engine. - -' -. ./test-lib.sh -. "$TEST_DIRECTORY"/diff-lib.sh - -test_expect_success 'setup' ' - cat >path0 <<-\EOF && - Line 1 - Line 2 - Line 3 - Line 4 - Line 5 - Line 6 - Line 7 - Line 8 - Line 9 - Line 10 - line 11 - Line 12 - Line 13 - Line 14 - Line 15 - EOF - cat >expected <<-\EOF && - diff --git a/path0 b/path1 - rename from path0 - rename to path1 - --- a/path0 - +++ b/path1 - @@ -8,7 +8,7 @@ Line 7 - Line 8 - Line 9 - Line 10 - -line 11 - +Line 11 - Line 12 - Line 13 - Line 14 - EOF - cat >no-rename <<-\EOF - diff --git a/path0 b/path0 - deleted file mode 100644 - index fdbec44..0000000 - --- a/path0 - +++ /dev/null - @@ -1,15 +0,0 @@ - -Line 1 - -Line 2 - -Line 3 - -Line 4 - -Line 5 - -Line 6 - -Line 7 - -Line 8 - -Line 9 - -Line 10 - -line 11 - -Line 12 - -Line 13 - -Line 14 - -Line 15 - diff --git a/path1 b/path1 - new file mode 100644 - index 0000000..752c50e - --- /dev/null - +++ b/path1 - @@ -0,0 +1,15 @@ - +Line 1 - +Line 2 - +Line 3 - +Line 4 - +Line 5 - +Line 6 - +Line 7 - +Line 8 - +Line 9 - +Line 10 - +Line 11 - +Line 12 - +Line 13 - +Line 14 - +Line 15 - EOF -' - -test_expect_success \ - 'update-index --add a file.' \ - 'git update-index --add path0' - -test_expect_success \ - 'write that tree.' \ - 'tree=$(git write-tree) && echo $tree' - -sed -e 's/line/Line/' path1 -rm -f path0 -test_expect_success \ - 'renamed and edited the file.' \ - 'git update-index --add --remove path0 path1' - -test_expect_success \ - 'git diff-index -p -M after rename and editing.' \ - 'git diff-index -p -M $tree >current' - - -test_expect_success \ - 'validate the output.' \ - 'compare_diff_patch current expected' - -test_expect_success 'test diff.renames=true' ' - git -c diff.renames=true diff --cached $tree >current && - compare_diff_patch current expected -' - -test_expect_success 'test diff.renames=false' ' - git -c diff.renames=false diff --cached $tree >current && - compare_diff_patch current no-rename -' - -test_expect_success 'test diff.renames unset' ' - git diff --cached $tree >current && - compare_diff_patch current expected -' - -test_expect_success 'favour same basenames over different ones' ' - cp path1 another-path && - git add another-path && - git commit -m 1 && - git rm path1 && - mkdir subdir && - git mv another-path subdir/path1 && - git status >out && - test_i18ngrep "renamed: .*path1 -> subdir/path1" out -' - -test_expect_success 'test diff.renames=true for git status' ' - git -c diff.renames=true status >out && - test_i18ngrep "renamed: .*path1 -> subdir/path1" out -' - -test_expect_success 'test diff.renames=false for git status' ' - git -c diff.renames=false status >out && - test_i18ngrep ! "renamed: .*path1 -> subdir/path1" out && - test_i18ngrep "new file: .*subdir/path1" out && - test_i18ngrep "deleted: .*[^/]path1" out -' - -test_expect_success 'favour same basenames even with minor differences' ' - git show HEAD:path1 | sed "s/15/16/" > subdir/path1 && - git status >out && - test_i18ngrep "renamed: .*path1 -> subdir/path1" out -' - -test_expect_success 'two files with same basename and same content' ' - git reset --hard && - mkdir -p dir/A dir/B && - cp path1 dir/A/file && - cp path1 dir/B/file && - git add dir && - git commit -m 2 && - git mv dir other-dir && - git status >out && - test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file" out -' - -test_expect_success 'setup for many rename source candidates' ' - git reset --hard && - for i in 0 1 2 3 4 5 6 7 8 9; - do - for j in 0 1 2 3 4 5 6 7 8 9; - do - echo "$i$j" >"path$i$j" - done - done && - git add "path??" && - test_tick && - git commit -m "hundred" && - (cat path1 && echo new) >new-path && - echo old >>path1 && - git add new-path path1 && - git diff -l 4 -C -C --cached --name-status >actual 2>actual.err && - sed -e "s/^\([CM]\)[0-9]* /\1 /" actual >actual.munged && - cat >expect <<-EOF && - C path1 new-path - M path1 - EOF - test_cmp expect actual.munged && - grep warning actual.err -' - -test_expect_success 'rename pretty print with nothing in common' ' - mkdir -p a/b/ && - : >a/b/c && - git add a/b/c && - git commit -m "create a/b/c" && - mkdir -p c/b/ && - git mv a/b/c c/b/a && - git commit -m "a/b/c -> c/b/a" && - git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " a/b/c => c/b/a " output && - git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " a/b/c => c/b/a " output -' - -test_expect_success 'rename pretty print with common prefix' ' - mkdir -p c/d && - git mv c/b/a c/d/e && - git commit -m "c/b/a -> c/d/e" && - git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " c/{b/a => d/e} " output && - git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " c/{b/a => d/e} " output -' - -test_expect_success 'rename pretty print with common suffix' ' - mkdir d && - git mv c/d/e d/e && - git commit -m "c/d/e -> d/e" && - git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " {c/d => d}/e " output && - git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " {c/d => d}/e " output -' - -test_expect_success 'rename pretty print with common prefix and suffix' ' - mkdir d/f && - git mv d/e d/f/e && - git commit -m "d/e -> d/f/e" && - git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " d/{ => f}/e " output && - git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " d/{ => f}/e " output -' - -test_expect_success 'rename pretty print common prefix and suffix overlap' ' - mkdir d/f/f && - git mv d/f/e d/f/f/e && - git commit -m "d/f/e d/f/f/e" && - git diff -M --summary HEAD^ HEAD >output && - test_i18ngrep " d/f/{ => f}/e " output && - git diff -M --stat HEAD^ HEAD >output && - test_i18ngrep " d/f/{ => f}/e " output -' - -test_expect_success 'diff-tree -l0 defaults to a big rename limit, not zero' ' - test_write_lines line1 line2 line3 >myfile && - git add myfile && - git commit -m x && - - test_write_lines line1 line2 line4 >myotherfile && - git rm myfile && - git add myotherfile && - git commit -m x && - - git diff-tree -M -l0 HEAD HEAD^ >actual && - # Verify that a rename from myotherfile to myfile was detected - grep "myotherfile.*myfile" actual -' - -test_done -- cgit 1.4.1