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/t6041-bisect-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/t6041-bisect-submodule.sh')
-rwxr-xr-x | third_party/git/t/t6041-bisect-submodule.sh | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/third_party/git/t/t6041-bisect-submodule.sh b/third_party/git/t/t6041-bisect-submodule.sh deleted file mode 100755 index df1eff0fb831..000000000000 --- a/third_party/git/t/t6041-bisect-submodule.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -test_description='bisect can handle submodules' - -. ./test-lib.sh -. "$TEST_DIRECTORY"/lib-submodule-update.sh - -git_bisect () { - git status -su >expect && - ls -1pR * >>expect && - tar cf "$TRASH_DIRECTORY/tmp.tar" * && - GOOD=$(git rev-parse --verify HEAD) && - may_only_be_test_must_fail "$2" && - $2 git checkout "$1" && - if test -n "$2" - then - return - fi && - echo "foo" >bar && - git add bar && - git commit -m "bisect bad" && - BAD=$(git rev-parse --verify HEAD) && - git reset --hard HEAD^^ && - git submodule update && - git bisect start && - git bisect good $GOOD && - rm -rf * && - tar xf "$TRASH_DIRECTORY/tmp.tar" && - git status -su >actual && - ls -1pR * >>actual && - test_cmp expect actual && - git bisect bad $BAD -} - -test_submodule_switch_func "git_bisect" - -test_done |