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/t5001-archive-attr.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/t5001-archive-attr.sh')
-rwxr-xr-x | third_party/git/t/t5001-archive-attr.sh | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/third_party/git/t/t5001-archive-attr.sh b/third_party/git/t/t5001-archive-attr.sh deleted file mode 100755 index e9aa97117ab4..000000000000 --- a/third_party/git/t/t5001-archive-attr.sh +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/sh - -test_description='git archive attribute tests' - -. ./test-lib.sh - -SUBSTFORMAT='%H (%h)%n' - -test_expect_exists() { - test_expect_${2:-success} " $1 exists" "test -e $1" -} - -test_expect_missing() { - test_expect_${2:-success} " $1 does not exist" "test ! -e $1" -} - -extract_tar_to_dir () { - (mkdir "$1" && cd "$1" && "$TAR" xf -) <"$1.tar" -} - -test_expect_success 'setup' ' - echo ignored >ignored && - echo ignored export-ignore >>.git/info/attributes && - git add ignored && - - echo ignored by tree >ignored-by-tree && - echo ignored-by-tree export-ignore >.gitattributes && - mkdir ignored-by-tree.d && - >ignored-by-tree.d/file && - echo ignored-by-tree.d export-ignore >>.gitattributes && - git add ignored-by-tree ignored-by-tree.d .gitattributes && - - echo ignored by worktree >ignored-by-worktree && - echo ignored-by-worktree export-ignore >.gitattributes && - git add ignored-by-worktree && - - mkdir excluded-by-pathspec.d && - >excluded-by-pathspec.d/file && - git add excluded-by-pathspec.d && - - printf "A\$Format:%s\$O" "$SUBSTFORMAT" >nosubstfile && - printf "A\$Format:%s\$O" "$SUBSTFORMAT" >substfile1 && - printf "A not substituted O" >substfile2 && - echo "substfile?" export-subst >>.git/info/attributes && - git add nosubstfile substfile1 substfile2 && - - git commit -m. && - - git clone --bare . bare && - cp .git/info/attributes bare/info/attributes -' - -test_expect_success 'git archive' ' - git archive HEAD >archive.tar && - (mkdir archive && cd archive && "$TAR" xf -) <archive.tar -' - -test_expect_missing archive/ignored -test_expect_missing archive/ignored-by-tree -test_expect_missing archive/ignored-by-tree.d -test_expect_missing archive/ignored-by-tree.d/file -test_expect_exists archive/ignored-by-worktree -test_expect_exists archive/excluded-by-pathspec.d -test_expect_exists archive/excluded-by-pathspec.d/file - -test_expect_success 'git archive with pathspec' ' - git archive HEAD ":!excluded-by-pathspec.d" >archive-pathspec.tar && - extract_tar_to_dir archive-pathspec -' - -test_expect_missing archive-pathspec/ignored -test_expect_missing archive-pathspec/ignored-by-tree -test_expect_missing archive-pathspec/ignored-by-tree.d -test_expect_missing archive-pathspec/ignored-by-tree.d/file -test_expect_exists archive-pathspec/ignored-by-worktree -test_expect_missing archive-pathspec/excluded-by-pathspec.d -test_expect_missing archive-pathspec/excluded-by-pathspec.d/file - -test_expect_success 'git archive with wildcard pathspec' ' - git archive HEAD ":!excluded-by-p*" >archive-pathspec-wildcard.tar && - extract_tar_to_dir archive-pathspec-wildcard -' - -test_expect_missing archive-pathspec-wildcard/ignored -test_expect_missing archive-pathspec-wildcard/ignored-by-tree -test_expect_missing archive-pathspec-wildcard/ignored-by-tree.d -test_expect_missing archive-pathspec-wildcard/ignored-by-tree.d/file -test_expect_exists archive-pathspec-wildcard/ignored-by-worktree -test_expect_missing archive-pathspec-wildcard/excluded-by-pathspec.d -test_expect_missing archive-pathspec-wildcard/excluded-by-pathspec.d/file - -test_expect_success 'git archive with worktree attributes' ' - git archive --worktree-attributes HEAD >worktree.tar && - (mkdir worktree && cd worktree && "$TAR" xf -) <worktree.tar -' - -test_expect_missing worktree/ignored -test_expect_exists worktree/ignored-by-tree -test_expect_missing worktree/ignored-by-worktree - -test_expect_success 'git archive --worktree-attributes option' ' - git archive --worktree-attributes --worktree-attributes HEAD >worktree.tar && - (mkdir worktree2 && cd worktree2 && "$TAR" xf -) <worktree.tar -' - -test_expect_missing worktree2/ignored -test_expect_exists worktree2/ignored-by-tree -test_expect_missing worktree2/ignored-by-worktree - -test_expect_success 'git archive vs. bare' ' - (cd bare && git archive HEAD) >bare-archive.tar && - test_cmp_bin archive.tar bare-archive.tar -' - -test_expect_success 'git archive with worktree attributes, bare' ' - (cd bare && git archive --worktree-attributes HEAD) >bare-worktree.tar && - (mkdir bare-worktree && cd bare-worktree && "$TAR" xf -) <bare-worktree.tar -' - -test_expect_missing bare-worktree/ignored -test_expect_exists bare-worktree/ignored-by-tree -test_expect_exists bare-worktree/ignored-by-worktree - -test_expect_success 'export-subst' ' - git log "--pretty=format:A${SUBSTFORMAT}O" HEAD >substfile1.expected && - test_cmp nosubstfile archive/nosubstfile && - test_cmp substfile1.expected archive/substfile1 && - test_cmp substfile2 archive/substfile2 -' - -test_done |