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/t6438-submodule-directory-file-conflicts.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/t6438-submodule-directory-file-conflicts.sh')
| -rwxr-xr-x | third_party/git/t/t6438-submodule-directory-file-conflicts.sh | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/third_party/git/t/t6438-submodule-directory-file-conflicts.sh b/third_party/git/t/t6438-submodule-directory-file-conflicts.sh deleted file mode 100755 index 04bf4be7d7..0000000000 --- a/third_party/git/t/t6438-submodule-directory-file-conflicts.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -test_description='merge can handle submodules' - -. ./test-lib.sh -. "$TEST_DIRECTORY"/lib-submodule-update.sh - -# merges without conflicts -test_submodule_switch "merge" - -test_submodule_switch "merge --ff" - -test_submodule_switch "merge --ff-only" - -KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 -KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 -test_submodule_switch "merge --no-ff" - -test_done |