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/t4136-apply-check.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/t4136-apply-check.sh')
| -rwxr-xr-x | third_party/git/t/t4136-apply-check.sh | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/third_party/git/t/t4136-apply-check.sh b/third_party/git/t/t4136-apply-check.sh deleted file mode 100755 index 4c3f264a633b..000000000000 --- a/third_party/git/t/t4136-apply-check.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -test_description='git apply should exit non-zero with unrecognized input.' - -. ./test-lib.sh - -test_expect_success 'setup' ' - test_commit 1 -' - -test_expect_success 'apply --check exits non-zero with unrecognized input' ' - test_must_fail git apply --check - <<-\EOF - I am not a patch - I look nothing like a patch - git apply must fail - EOF -' - -test_expect_success 'apply exits non-zero with no-op patch' ' - cat >input <<-\EOF && - diff --get a/1 b/1 - index 6696ea4..606eddd 100644 - --- a/1 - +++ b/1 - @@ -1,1 +1,1 @@ - 1 - EOF - test_must_fail git apply --stat input && - test_must_fail git apply --check input -' - -test_expect_success '`apply --recount` allows no-op patch' ' - echo 1 >1 && - git apply --recount --check <<-\EOF - diff --get a/1 b/1 - index 6696ea4..606eddd 100644 - --- a/1 - +++ b/1 - @@ -1,1 +1,1 @@ - 1 - EOF -' - -test_expect_success 'invalid combination: create and copy' ' - test_must_fail git apply --check - <<-\EOF - diff --git a/1 b/2 - new file mode 100644 - copy from 1 - copy to 2 - EOF -' - -test_expect_success 'invalid combination: create and rename' ' - test_must_fail git apply --check - <<-\EOF - diff --git a/1 b/2 - new file mode 100644 - rename from 1 - rename to 2 - EOF -' - -test_done |