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/t6130-pathspec-noglob.sh | 160 ----------------------------- 1 file changed, 160 deletions(-) delete mode 100755 third_party/git/t/t6130-pathspec-noglob.sh (limited to 'third_party/git/t/t6130-pathspec-noglob.sh') diff --git a/third_party/git/t/t6130-pathspec-noglob.sh b/third_party/git/t/t6130-pathspec-noglob.sh deleted file mode 100755 index ba7902c9cdcd..000000000000 --- a/third_party/git/t/t6130-pathspec-noglob.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/bin/sh - -test_description='test globbing (and noglob) of pathspec limiting' -. ./test-lib.sh - -test_expect_success 'create commits with glob characters' ' - test_commit unrelated bar && - test_commit vanilla foo && - # insert file "f*" in the commit, but in a way that avoids - # the name "f*" in the worktree, because it is not allowed - # on Windows (the tests below do not depend on the presence - # of the file in the worktree) - git config core.protectNTFS false && - git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" && - test_tick && - git commit -m star && - test_commit bracket "f[o][o]" -' - -test_expect_success 'vanilla pathspec matches literally' ' - echo vanilla >expect && - git log --format=%s -- foo >actual && - test_cmp expect actual -' - -test_expect_success 'star pathspec globs' ' - cat >expect <<-\EOF && - bracket - star - vanilla - EOF - git log --format=%s -- "f*" >actual && - test_cmp expect actual -' - -test_expect_success 'star pathspec globs' ' - cat >expect <<-\EOF && - bracket - star - vanilla - EOF - git log --format=%s -- ":(glob)f*" >actual && - test_cmp expect actual -' - -test_expect_success 'bracket pathspec globs and matches literal brackets' ' - cat >expect <<-\EOF && - bracket - vanilla - EOF - git log --format=%s -- "f[o][o]" >actual && - test_cmp expect actual -' - -test_expect_success 'bracket pathspec globs and matches literal brackets' ' - cat >expect <<-\EOF && - bracket - vanilla - EOF - git log --format=%s -- ":(glob)f[o][o]" >actual && - test_cmp expect actual -' - -test_expect_success 'no-glob option matches literally (vanilla)' ' - echo vanilla >expect && - git --literal-pathspecs log --format=%s -- foo >actual && - test_cmp expect actual -' - -test_expect_success 'no-glob option matches literally (vanilla)' ' - echo vanilla >expect && - git log --format=%s -- ":(literal)foo" >actual && - test_cmp expect actual -' - -test_expect_success 'no-glob option matches literally (star)' ' - echo star >expect && - git --literal-pathspecs log --format=%s -- "f*" >actual && - test_cmp expect actual -' - -test_expect_success 'no-glob option matches literally (star)' ' - echo star >expect && - git log --format=%s -- ":(literal)f*" >actual && - test_cmp expect actual -' - -test_expect_success 'no-glob option matches literally (bracket)' ' - echo bracket >expect && - git --literal-pathspecs log --format=%s -- "f[o][o]" >actual && - test_cmp expect actual -' - -test_expect_success 'no-glob option matches literally (bracket)' ' - echo bracket >expect && - git log --format=%s -- ":(literal)f[o][o]" >actual && - test_cmp expect actual -' - -test_expect_success 'no-glob option disables :(literal)' ' - git --literal-pathspecs log --format=%s -- ":(literal)foo" >actual && - test_must_be_empty actual -' - -test_expect_success 'no-glob environment variable works' ' - echo star >expect && - GIT_LITERAL_PATHSPECS=1 git log --format=%s -- "f*" >actual && - test_cmp expect actual -' - -test_expect_success 'blame takes global pathspec flags' ' - git --literal-pathspecs blame -- foo && - git --icase-pathspecs blame -- foo && - git --glob-pathspecs blame -- foo && - git --noglob-pathspecs blame -- foo -' - -test_expect_success 'setup xxx/bar' ' - mkdir xxx && - test_commit xxx xxx/bar -' - -test_expect_success '**/ works with :(glob)' ' - cat >expect <<-\EOF && - xxx - unrelated - EOF - git log --format=%s -- ":(glob)**/bar" >actual && - test_cmp expect actual -' - -test_expect_success '**/ does not work with --noglob-pathspecs' ' - git --noglob-pathspecs log --format=%s -- "**/bar" >actual && - test_must_be_empty actual -' - -test_expect_success '**/ works with :(glob) and --noglob-pathspecs' ' - cat >expect <<-\EOF && - xxx - unrelated - EOF - git --noglob-pathspecs log --format=%s -- ":(glob)**/bar" >actual && - test_cmp expect actual -' - -test_expect_success '**/ works with --glob-pathspecs' ' - cat >expect <<-\EOF && - xxx - unrelated - EOF - git --glob-pathspecs log --format=%s -- "**/bar" >actual && - test_cmp expect actual -' - -test_expect_success '**/ does not work with :(literal) and --glob-pathspecs' ' - git --glob-pathspecs log --format=%s -- ":(literal)**/bar" >actual && - test_must_be_empty actual -' - -test_done -- cgit 1.4.1