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/t7516-commit-races.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/t7516-commit-races.sh')
-rwxr-xr-x | third_party/git/t/t7516-commit-races.sh | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/third_party/git/t/t7516-commit-races.sh b/third_party/git/t/t7516-commit-races.sh deleted file mode 100755 index f2ce14e9071c..000000000000 --- a/third_party/git/t/t7516-commit-races.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -test_description='git commit races' -. ./test-lib.sh - -test_expect_success 'race to create orphan commit' ' - write_script hare-editor <<-\EOF && - git commit --allow-empty -m hare - EOF - test_must_fail env EDITOR=./hare-editor git commit --allow-empty -m tortoise -e && - git show -s --pretty=format:%s >subject && - grep hare subject && - test -z "$(git show -s --pretty=format:%P)" -' - -test_expect_success 'race to create non-orphan commit' ' - write_script airplane-editor <<-\EOF && - git commit --allow-empty -m airplane - EOF - git checkout --orphan branch && - git commit --allow-empty -m base && - git rev-parse HEAD >base && - test_must_fail env EDITOR=./airplane-editor git commit --allow-empty -m ship -e && - git show -s --pretty=format:%s >subject && - grep airplane subject && - git rev-parse HEAD^ >parent && - test_cmp base parent -' - -test_done |