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/t2021-checkout-overwrite.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/t2021-checkout-overwrite.sh')
-rwxr-xr-x | third_party/git/t/t2021-checkout-overwrite.sh | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/third_party/git/t/t2021-checkout-overwrite.sh b/third_party/git/t/t2021-checkout-overwrite.sh deleted file mode 100755 index c2ada7de3731..000000000000 --- a/third_party/git/t/t2021-checkout-overwrite.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -test_description='checkout must not overwrite an untracked objects' -. ./test-lib.sh - -test_expect_success 'setup' ' - - mkdir -p a/b/c && - >a/b/c/d && - git add -A && - git commit -m base && - git tag start -' - -test_expect_success 'create a commit where dir a/b changed to file' ' - - git checkout -b file && - rm -rf a/b && - >a/b && - git add -A && - git commit -m "dir to file" -' - -test_expect_success 'checkout commit with dir must not remove untracked a/b' ' - - git rm --cached a/b && - git commit -m "un-track the file" && - test_must_fail git checkout start && - test -f a/b -' - -test_expect_success 'create a commit where dir a/b changed to symlink' ' - - rm -rf a/b && # cleanup if previous test failed - git checkout -f -b symlink start && - rm -rf a/b && - git add -A && - test_ln_s_add foo a/b && - git commit -m "dir to symlink" -' - -test_expect_success 'checkout commit with dir must not remove untracked a/b' ' - - git rm --cached a/b && - git commit -m "un-track the symlink" && - test_must_fail git checkout start -' - -test_expect_success SYMLINKS 'the symlink remained' ' - - test -h a/b -' - -test_done |