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/t6419-merge-ignorecase.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/t6419-merge-ignorecase.sh')
-rwxr-xr-x | third_party/git/t/t6419-merge-ignorecase.sh | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/third_party/git/t/t6419-merge-ignorecase.sh b/third_party/git/t/t6419-merge-ignorecase.sh deleted file mode 100755 index 531850d834df..000000000000 --- a/third_party/git/t/t6419-merge-ignorecase.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -test_description='git-merge with case-changing rename on case-insensitive file system' - -. ./test-lib.sh - -if ! test_have_prereq CASE_INSENSITIVE_FS -then - skip_all='skipping case insensitive tests - case sensitive file system' - test_done -fi - -test_expect_success 'merge with case-changing rename' ' - test $(git config core.ignorecase) = true && - >TestCase && - git add TestCase && - git commit -m "add TestCase" && - git tag baseline && - git checkout -b with-camel && - >foo && - git add foo && - git commit -m "intervening commit" && - git checkout master && - git rm TestCase && - >testcase && - git add testcase && - git commit -m "rename to testcase" && - git checkout with-camel && - git merge master -m "merge" && - test_path_is_file testcase -' - -test_expect_success 'merge with case-changing rename on both sides' ' - git checkout master && - git reset --hard baseline && - git branch -D with-camel && - git checkout -b with-camel && - git mv TestCase testcase && - git commit -m "recase on branch" && - >foo && - git add foo && - git commit -m "intervening commit" && - git checkout master && - git rm TestCase && - >testcase && - git add testcase && - git commit -m "rename to testcase" && - git checkout with-camel && - git merge master -m "merge" && - test_path_is_file testcase -' - -test_done |