diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t2204-add-ignored.sh | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
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
Diffstat (limited to 'third_party/git/t/t2204-add-ignored.sh')
-rwxr-xr-x | third_party/git/t/t2204-add-ignored.sh | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/third_party/git/t/t2204-add-ignored.sh b/third_party/git/t/t2204-add-ignored.sh deleted file mode 100755 index 2e07365bbb05..000000000000 --- a/third_party/git/t/t2204-add-ignored.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh - -test_description='giving ignored paths to git add' - -. ./test-lib.sh - -test_expect_success setup ' - mkdir sub dir dir/sub && - echo sub >.gitignore && - echo ign >>.gitignore && - for p in . sub dir dir/sub - do - >"$p/ign" && - >"$p/file" || exit 1 - done -' - -for i in file dir/file dir 'd*' -do - test_expect_success "no complaints for unignored $i" ' - rm -f .git/index && - git add "$i" && - git ls-files "$i" >out && - test -s out - ' -done - -for i in ign dir/ign dir/sub dir/sub/*ign sub/file sub sub/* -do - test_expect_success "complaints for ignored $i" ' - rm -f .git/index && - test_must_fail git add "$i" 2>err && - git ls-files "$i" >out && - test_must_be_empty out - ' - - test_expect_success "complaints for ignored $i output" ' - test_i18ngrep -e "Use -f if" err - ' - - test_expect_success "complaints for ignored $i with unignored file" ' - rm -f .git/index && - test_must_fail git add "$i" file 2>err && - git ls-files "$i" >out && - test_must_be_empty out - ' - test_expect_success "complaints for ignored $i with unignored file output" ' - test_i18ngrep -e "Use -f if" err - ' -done - -for i in sub sub/* -do - test_expect_success "complaints for ignored $i in dir" ' - rm -f .git/index && - ( - cd dir && - test_must_fail git add "$i" 2>err && - git ls-files "$i" >out && - test_must_be_empty out - ) - ' - - test_expect_success "complaints for ignored $i in dir output" ' - ( - cd dir && - test_i18ngrep -e "Use -f if" err - ) - ' -done - -for i in ign file -do - test_expect_success "complaints for ignored $i in sub" ' - rm -f .git/index && - ( - cd sub && - test_must_fail git add "$i" 2>err && - git ls-files "$i" >out && - test_must_be_empty out - ) - ' - - test_expect_success "complaints for ignored $i in sub output" ' - ( - cd sub && - test_i18ngrep -e "Use -f if" err - ) - ' -done - -test_done |