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/t4105-apply-fuzz.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/t4105-apply-fuzz.sh')
-rwxr-xr-x | third_party/git/t/t4105-apply-fuzz.sh | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/third_party/git/t/t4105-apply-fuzz.sh b/third_party/git/t/t4105-apply-fuzz.sh deleted file mode 100755 index 3266e3940039..000000000000 --- a/third_party/git/t/t4105-apply-fuzz.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -test_description='apply with fuzz and offset' - -. ./test-lib.sh - -dotest () { - name="$1" && shift && - test_expect_success "$name" " - git checkout-index -f -q -u file && - git apply $* && - test_cmp expect file - " -} - -test_expect_success setup ' - - for i in 1 2 3 4 5 6 7 8 9 10 11 12 - do - echo $i - done >file && - git update-index --add file && - for i in 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12 - do - echo $i - done >file && - cat file >expect && - git diff >O0.diff && - - sed -e "s/@@ -5,6 +5,11 @@/@@ -2,6 +2,11 @@/" >O1.diff O0.diff && - sed -e "s/@@ -5,6 +5,11 @@/@@ -7,6 +7,11 @@/" >O2.diff O0.diff && - sed -e "s/@@ -5,6 +5,11 @@/@@ -19,6 +19,11 @@/" >O3.diff O0.diff && - - sed -e "s/^ 5/ S/" >F0.diff O0.diff && - sed -e "s/^ 5/ S/" >F1.diff O1.diff && - sed -e "s/^ 5/ S/" >F2.diff O2.diff && - sed -e "s/^ 5/ S/" >F3.diff O3.diff - -' - -dotest 'unmodified patch' O0.diff - -dotest 'minus offset' O1.diff - -dotest 'plus offset' O2.diff - -dotest 'big offset' O3.diff - -dotest 'fuzz with no offset' -C2 F0.diff - -dotest 'fuzz with minus offset' -C2 F1.diff - -dotest 'fuzz with plus offset' -C2 F2.diff - -dotest 'fuzz with big offset' -C2 F3.diff - -test_done |