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/t7525-status-rename.sh | 113 ------------------------------- 1 file changed, 113 deletions(-) delete mode 100755 third_party/git/t/t7525-status-rename.sh (limited to 'third_party/git/t/t7525-status-rename.sh') diff --git a/third_party/git/t/t7525-status-rename.sh b/third_party/git/t/t7525-status-rename.sh deleted file mode 100755 index a62736dce09f..000000000000 --- a/third_party/git/t/t7525-status-rename.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh - -test_description='git status rename detection options' - -. ./test-lib.sh - -test_expect_success 'setup' ' - echo 1 >original && - git add . && - git commit -m"Adding original file." && - mv original renamed && - echo 2 >> renamed && - git add . && - cat >.gitignore <<-\EOF - .gitignore - expect* - actual* - EOF -' - -test_expect_success 'status no-options' ' - git status >actual && - test_i18ngrep "renamed:" actual -' - -test_expect_success 'status --no-renames' ' - git status --no-renames >actual && - test_i18ngrep "deleted:" actual && - test_i18ngrep "new file:" actual -' - -test_expect_success 'status.renames inherits from diff.renames false' ' - git -c diff.renames=false status >actual && - test_i18ngrep "deleted:" actual && - test_i18ngrep "new file:" actual -' - -test_expect_success 'status.renames inherits from diff.renames true' ' - git -c diff.renames=true status >actual && - test_i18ngrep "renamed:" actual -' - -test_expect_success 'status.renames overrides diff.renames false' ' - git -c diff.renames=true -c status.renames=false status >actual && - test_i18ngrep "deleted:" actual && - test_i18ngrep "new file:" actual -' - -test_expect_success 'status.renames overrides from diff.renames true' ' - git -c diff.renames=false -c status.renames=true status >actual && - test_i18ngrep "renamed:" actual -' - -test_expect_success 'status status.renames=false' ' - git -c status.renames=false status >actual && - test_i18ngrep "deleted:" actual && - test_i18ngrep "new file:" actual -' - -test_expect_success 'status status.renames=true' ' - git -c status.renames=true status >actual && - test_i18ngrep "renamed:" actual -' - -test_expect_success 'commit honors status.renames=false' ' - git -c status.renames=false commit --dry-run >actual && - test_i18ngrep "deleted:" actual && - test_i18ngrep "new file:" actual -' - -test_expect_success 'commit honors status.renames=true' ' - git -c status.renames=true commit --dry-run >actual && - test_i18ngrep "renamed:" actual -' - -test_expect_success 'status config overridden' ' - git -c status.renames=true status --no-renames >actual && - test_i18ngrep "deleted:" actual && - test_i18ngrep "new file:" actual -' - -test_expect_success 'status score=100%' ' - git status -M=100% >actual && - test_i18ngrep "deleted:" actual && - test_i18ngrep "new file:" actual && - - git status --find-renames=100% >actual && - test_i18ngrep "deleted:" actual && - test_i18ngrep "new file:" actual -' - -test_expect_success 'status score=01%' ' - git status -M=01% >actual && - test_i18ngrep "renamed:" actual && - - git status --find-renames=01% >actual && - test_i18ngrep "renamed:" actual -' - -test_expect_success 'copies not overridden by find-renames' ' - cp renamed copy && - git add copy && - - git -c status.renames=copies status -M=01% >actual && - test_i18ngrep "copied:" actual && - test_i18ngrep "renamed:" actual && - - git -c status.renames=copies status --find-renames=01% >actual && - test_i18ngrep "copied:" actual && - test_i18ngrep "renamed:" actual -' - -test_done -- cgit 1.4.1