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/t3040-subprojects-basic.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/t3040-subprojects-basic.sh')
-rwxr-xr-x | third_party/git/t/t3040-subprojects-basic.sh | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/third_party/git/t/t3040-subprojects-basic.sh b/third_party/git/t/t3040-subprojects-basic.sh deleted file mode 100755 index b81eb5fd6ffa..000000000000 --- a/third_party/git/t/t3040-subprojects-basic.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -test_description='Basic subproject functionality' -. ./test-lib.sh - -test_expect_success 'setup: create superproject' ' - : >Makefile && - git add Makefile && - git commit -m "Superproject created" -' - -test_expect_success 'setup: create subprojects' ' - mkdir sub1 && - ( cd sub1 && git init && : >Makefile && git add * && - git commit -q -m "subproject 1" ) && - mkdir sub2 && - ( cd sub2 && git init && : >Makefile && git add * && - git commit -q -m "subproject 2" ) && - git update-index --add sub1 && - git add sub2 && - git commit -q -m "subprojects added" && - GIT_PRINT_SHA1_ELLIPSIS="yes" git diff-tree --abbrev=5 HEAD^ HEAD |cut -d" " -f-3,5- >current && - git branch save HEAD && - cat >expected <<-\EOF && - :000000 160000 00000... A sub1 - :000000 160000 00000... A sub2 - EOF - test_cmp expected current -' - -test_expect_success 'check if fsck ignores the subprojects' ' - git fsck --full -' - -test_expect_success 'check if commit in a subproject detected' ' - ( cd sub1 && - echo "all:" >>Makefile && - echo " true" >>Makefile && - git commit -q -a -m "make all" ) && - test_expect_code 1 git diff-files --exit-code -' - -test_expect_success 'check if a changed subproject HEAD can be committed' ' - git commit -q -a -m "sub1 changed" && - test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD -' - -test_expect_success 'check if diff-index works for subproject elements' ' - test_expect_code 1 git diff-index --exit-code --cached save -- sub1 -' - -test_expect_success 'check if diff-tree works for subproject elements' ' - test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD -- sub1 -' - -test_expect_success 'check if git diff works for subproject elements' ' - test_expect_code 1 git diff --exit-code HEAD^ HEAD -' - -test_expect_success 'check if clone works' ' - git ls-files -s >expected && - git clone -l -s . cloned && - ( cd cloned && git ls-files -s ) >current && - test_cmp expected current -' - -test_expect_success 'removing and adding subproject' ' - git update-index --force-remove -- sub2 && - mv sub2 sub3 && - git add sub3 && - git commit -q -m "renaming a subproject" && - test_expect_code 1 git diff -M --name-status --exit-code HEAD^ HEAD -' - -# the index must contain the object name the HEAD of the -# subproject sub1 was at the point "save" -test_expect_success 'checkout in superproject' ' - git checkout save && - git diff-index --exit-code --raw --cached save -- sub1 -' - -# just interesting what happened... -# git diff --name-status -M save master - -test_done |