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/t6435-merge-sparse.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/t6435-merge-sparse.sh')
-rwxr-xr-x | third_party/git/t/t6435-merge-sparse.sh | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/third_party/git/t/t6435-merge-sparse.sh b/third_party/git/t/t6435-merge-sparse.sh deleted file mode 100755 index 74562e123566..000000000000 --- a/third_party/git/t/t6435-merge-sparse.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -test_description='merge with sparse files' - -. ./test-lib.sh - -# test_file $filename $content -test_file () { - echo "$2" > "$1" && - git add "$1" -} - -# test_commit_this $message_and_tag -test_commit_this () { - git commit -m "$1" && - git tag "$1" -} - -test_expect_success 'setup' ' - test_file checked-out init && - test_file modify_delete modify_delete_init && - test_commit_this init && - test_file modify_delete modify_delete_theirs && - test_commit_this theirs && - git reset --hard init && - git rm modify_delete && - test_commit_this ours && - git config core.sparseCheckout true && - echo "/checked-out" >.git/info/sparse-checkout && - git reset --hard && - test_must_fail git merge theirs -' - -test_expect_success 'reset --hard works after the conflict' ' - git reset --hard -' - -test_expect_success 'is reset properly' ' - git status --porcelain -- modify_delete >out && - test_must_be_empty out && - test_path_is_missing modify_delete -' - -test_expect_success 'setup: conflict back' ' - test_must_fail git merge theirs -' - -test_expect_success 'Merge abort works after the conflict' ' - git merge --abort -' - -test_expect_success 'is aborted properly' ' - git status --porcelain -- modify_delete >out && - test_must_be_empty out && - test_path_is_missing modify_delete -' - -test_done |