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/t4035-diff-quiet.sh | 164 ---------------------------------- 1 file changed, 164 deletions(-) delete mode 100755 third_party/git/t/t4035-diff-quiet.sh (limited to 'third_party/git/t/t4035-diff-quiet.sh') diff --git a/third_party/git/t/t4035-diff-quiet.sh b/third_party/git/t/t4035-diff-quiet.sh deleted file mode 100755 index 0352bf81a90a..000000000000 --- a/third_party/git/t/t4035-diff-quiet.sh +++ /dev/null @@ -1,164 +0,0 @@ -#!/bin/sh - -test_description='Return value of diffs' - -. ./test-lib.sh - -test_expect_success 'setup' ' - echo 1 >a && - git add . && - git commit -m first && - echo 2 >b && - git add . && - git commit -a -m second && - mkdir -p test-outside/repo && ( - cd test-outside/repo && - git init && - echo "1 1" >a && - git add . && - git commit -m 1 - ) && - mkdir -p test-outside/non/git && ( - cd test-outside/non/git && - echo "1 1" >a && - echo "1 1" >matching-file && - echo "1 1 " >trailing-space && - echo "1 1" >extra-space && - echo "2" >never-match - ) -' - -test_expect_success 'git diff-tree HEAD^ HEAD' ' - test_expect_code 1 git diff-tree --quiet HEAD^ HEAD >cnt && - test_line_count = 0 cnt -' -test_expect_success 'git diff-tree HEAD^ HEAD -- a' ' - test_expect_code 0 git diff-tree --quiet HEAD^ HEAD -- a >cnt && - test_line_count = 0 cnt -' -test_expect_success 'git diff-tree HEAD^ HEAD -- b' ' - test_expect_code 1 git diff-tree --quiet HEAD^ HEAD -- b >cnt && - test_line_count = 0 cnt -' -# this diff outputs one line: sha1 of the given head -test_expect_success 'echo HEAD | git diff-tree --stdin' ' - echo $(git rev-parse HEAD) | - test_expect_code 1 git diff-tree --quiet --stdin >cnt && - test_line_count = 1 cnt -' -test_expect_success 'git diff-tree HEAD HEAD' ' - test_expect_code 0 git diff-tree --quiet HEAD HEAD >cnt && - test_line_count = 0 cnt -' -test_expect_success 'git diff-files' ' - test_expect_code 0 git diff-files --quiet >cnt && - test_line_count = 0 cnt -' -test_expect_success 'git diff-index --cached HEAD' ' - test_expect_code 0 git diff-index --quiet --cached HEAD >cnt && - test_line_count = 0 cnt -' -test_expect_success 'git diff-index --cached HEAD^' ' - test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt && - test_line_count = 0 cnt -' -test_expect_success 'git diff-index --cached HEAD^' ' - echo text >>b && - echo 3 >c && - git add . && - test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt && - test_line_count = 0 cnt -' -test_expect_success 'git diff-tree -Stext HEAD^ HEAD -- b' ' - git commit -m "text in b" && - test_expect_code 1 git diff-tree --quiet -Stext HEAD^ HEAD -- b >cnt && - test_line_count = 0 cnt -' -test_expect_success 'git diff-tree -Snot-found HEAD^ HEAD -- b' ' - test_expect_code 0 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt && - test_line_count = 0 cnt -' -test_expect_success 'git diff-files' ' - echo 3 >>c && - test_expect_code 1 git diff-files --quiet >cnt && - test_line_count = 0 cnt -' - -test_expect_success 'git diff-index --cached HEAD' ' - git update-index c && - test_expect_code 1 git diff-index --quiet --cached HEAD >cnt && - test_line_count = 0 cnt -' - -test_expect_success 'git diff, one file outside repo' ' - ( - cd test-outside/repo && - test_expect_code 0 git diff --quiet a ../non/git/matching-file && - test_expect_code 1 git diff --quiet a ../non/git/extra-space - ) -' - -test_expect_success 'git diff, both files outside repo' ' - ( - GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" && - export GIT_CEILING_DIRECTORIES && - cd test-outside/non/git && - test_expect_code 0 git diff --quiet a matching-file && - test_expect_code 1 git diff --quiet a extra-space - ) -' - -test_expect_success 'git diff --ignore-space-at-eol, one file outside repo' ' - ( - cd test-outside/repo && - test_expect_code 0 git diff --quiet --ignore-space-at-eol a ../non/git/trailing-space && - test_expect_code 1 git diff --quiet --ignore-space-at-eol a ../non/git/extra-space - ) -' - -test_expect_success 'git diff --ignore-space-at-eol, both files outside repo' ' - ( - GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" && - export GIT_CEILING_DIRECTORIES && - cd test-outside/non/git && - test_expect_code 0 git diff --quiet --ignore-space-at-eol a trailing-space && - test_expect_code 1 git diff --quiet --ignore-space-at-eol a extra-space - ) -' - -test_expect_success 'git diff --ignore-all-space, one file outside repo' ' - ( - cd test-outside/repo && - test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/trailing-space && - test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/extra-space && - test_expect_code 1 git diff --quiet --ignore-all-space a ../non/git/never-match - ) -' - -test_expect_success 'git diff --ignore-all-space, both files outside repo' ' - ( - GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" && - export GIT_CEILING_DIRECTORIES && - cd test-outside/non/git && - test_expect_code 0 git diff --quiet --ignore-all-space a trailing-space && - test_expect_code 0 git diff --quiet --ignore-all-space a extra-space && - test_expect_code 1 git diff --quiet --ignore-all-space a never-match - ) -' - -test_expect_success 'git diff --quiet ignores stat-change only entries' ' - test-tool chmtime +10 a && - echo modified >>b && - test_expect_code 1 git diff --quiet -' - -test_expect_success 'git diff --quiet on a path that need conversion' ' - echo "crlf.txt text=auto" >.gitattributes && - printf "Hello\r\nWorld\r\n" >crlf.txt && - git add .gitattributes crlf.txt && - - printf "Hello\r\nWorld\n" >crlf.txt && - git diff --quiet crlf.txt -' - -test_done -- cgit 1.4.1