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/t3426-rebase-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/t3426-rebase-submodule.sh')
-rwxr-xr-x | third_party/git/t/t3426-rebase-submodule.sh | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/third_party/git/t/t3426-rebase-submodule.sh b/third_party/git/t/t3426-rebase-submodule.sh deleted file mode 100755 index 0ad3a07bf470..000000000000 --- a/third_party/git/t/t3426-rebase-submodule.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -test_description='rebase can handle submodules' - -. ./test-lib.sh -. "$TEST_DIRECTORY"/lib-submodule-update.sh -. "$TEST_DIRECTORY"/lib-rebase.sh - -git_rebase () { - git status -su >expect && - ls -1pR * >>expect && - git checkout -b ours HEAD && - echo x >>file1 && - git add file1 && - git commit -m add_x && - git revert HEAD && - git status -su >actual && - ls -1pR * >>actual && - test_cmp expect actual && - may_only_be_test_must_fail "$2" && - $2 git rebase "$1" -} - -test_submodule_switch_func "git_rebase" - -git_rebase_interactive () { - git status -su >expect && - ls -1pR * >>expect && - git checkout -b ours HEAD && - echo x >>file1 && - git add file1 && - git commit -m add_x && - git revert HEAD && - git status -su >actual && - ls -1pR * >>actual && - test_cmp expect actual && - set_fake_editor && - echo "fake-editor.sh" >.git/info/exclude && - may_only_be_test_must_fail "$2" && - $2 git rebase -i "$1" -} - -test_submodule_switch_func "git_rebase_interactive" - -test_expect_success 'rebase interactive ignores modified submodules' ' - test_when_finished "rm -rf super sub" && - git init sub && - git -C sub commit --allow-empty -m "Initial commit" && - git init super && - git -C super submodule add ../sub && - git -C super config submodule.sub.ignore dirty && - >super/foo && - git -C super add foo && - git -C super commit -m "Initial commit" && - test_commit -C super a && - test_commit -C super b && - test_commit -C super/sub c && - set_fake_editor && - git -C super rebase -i HEAD^^ -' - -test_done |