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/t7104-reset-hard.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/t7104-reset-hard.sh')
-rwxr-xr-x | third_party/git/t/t7104-reset-hard.sh | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/third_party/git/t/t7104-reset-hard.sh b/third_party/git/t/t7104-reset-hard.sh deleted file mode 100755 index 16faa0781373..000000000000 --- a/third_party/git/t/t7104-reset-hard.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -test_description='reset --hard unmerged' - -. ./test-lib.sh - -test_expect_success setup ' - - mkdir before later && - >before/1 && - >before/2 && - >hello && - >later/3 && - git add before hello later && - git commit -m world && - - H=$(git rev-parse :hello) && - git rm --cached hello && - echo "100644 $H 2 hello" | git update-index --index-info && - - rm -f hello && - mkdir -p hello && - >hello/world && - test "$(git ls-files -o)" = hello/world - -' - -test_expect_success 'reset --hard should restore unmerged ones' ' - - git reset --hard && - git ls-files --error-unmatch before/1 before/2 hello later/3 && - test -f hello - -' - -test_expect_success 'reset --hard did not corrupt index or cached-tree' ' - - T=$(git write-tree) && - rm -f .git/index && - git add before hello later && - U=$(git write-tree) && - test "$T" = "$U" - -' - -test_done |