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/t2013-checkout-submodule.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/t2013-checkout-submodule.sh')
-rwxr-xr-x | third_party/git/t/t2013-checkout-submodule.sh | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/third_party/git/t/t2013-checkout-submodule.sh b/third_party/git/t/t2013-checkout-submodule.sh deleted file mode 100755 index b2bdd1fcb425..000000000000 --- a/third_party/git/t/t2013-checkout-submodule.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh - -test_description='checkout can handle submodules' - -. ./test-lib.sh -. "$TEST_DIRECTORY"/lib-submodule-update.sh - -test_expect_success 'setup' ' - mkdir submodule && - (cd submodule && - git init && - test_commit first) && - git add submodule && - test_tick && - git commit -m superproject && - (cd submodule && - test_commit second) && - git add submodule && - test_tick && - git commit -m updated.superproject -' - -test_expect_success '"reset <submodule>" updates the index' ' - git update-index --refresh && - git diff-files --quiet && - git diff-index --quiet --cached HEAD && - git reset HEAD^ submodule && - test_must_fail git diff-files --quiet && - git reset submodule && - git diff-files --quiet -' - -test_expect_success '"checkout <submodule>" updates the index only' ' - git update-index --refresh && - git diff-files --quiet && - git diff-index --quiet --cached HEAD && - git checkout HEAD^ submodule && - test_must_fail git diff-files --quiet && - git checkout HEAD submodule && - git diff-files --quiet -' - -test_expect_success '"checkout <submodule>" honors diff.ignoreSubmodules' ' - git config diff.ignoreSubmodules dirty && - echo x> submodule/untracked && - git checkout HEAD >actual 2>&1 && - test_must_be_empty actual -' - -test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .gitmodules' ' - git config diff.ignoreSubmodules none && - git config -f .gitmodules submodule.submodule.path submodule && - git config -f .gitmodules submodule.submodule.ignore untracked && - git checkout HEAD >actual 2>&1 && - test_must_be_empty actual -' - -test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .git/config' ' - git config -f .gitmodules submodule.submodule.ignore none && - git config submodule.submodule.path submodule && - git config submodule.submodule.ignore all && - git checkout HEAD >actual 2>&1 && - test_must_be_empty actual -' - -KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1 -test_submodule_switch_recursing_with_args "checkout" - -test_submodule_forced_switch_recursing_with_args "checkout -f" - -test_submodule_switch "checkout" - -test_submodule_forced_switch "checkout -f" - -test_done |