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/lib-diff-alternative.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/lib-diff-alternative.sh')
-rw-r--r-- | third_party/git/t/lib-diff-alternative.sh | 170 |
1 files changed, 0 insertions, 170 deletions
diff --git a/third_party/git/t/lib-diff-alternative.sh b/third_party/git/t/lib-diff-alternative.sh deleted file mode 100644 index 8d1e408bb58f..000000000000 --- a/third_party/git/t/lib-diff-alternative.sh +++ /dev/null @@ -1,170 +0,0 @@ -# Helpers shared by the test scripts for diff algorithms (patience, -# histogram, etc). - -test_diff_frobnitz() { - cat >file1 <<\EOF -#include <stdio.h> - -// Frobs foo heartily -int frobnitz(int foo) -{ - int i; - for(i = 0; i < 10; i++) - { - printf("Your answer is: "); - printf("%d\n", foo); - } -} - -int fact(int n) -{ - if(n > 1) - { - return fact(n-1) * n; - } - return 1; -} - -int main(int argc, char **argv) -{ - frobnitz(fact(10)); -} -EOF - - cat >file2 <<\EOF -#include <stdio.h> - -int fib(int n) -{ - if(n > 2) - { - return fib(n-1) + fib(n-2); - } - return 1; -} - -// Frobs foo heartily -int frobnitz(int foo) -{ - int i; - for(i = 0; i < 10; i++) - { - printf("%d\n", foo); - } -} - -int main(int argc, char **argv) -{ - frobnitz(fib(10)); -} -EOF - - file1=$(git rev-parse --short $(git hash-object file1)) - file2=$(git rev-parse --short $(git hash-object file2)) - cat >expect <<EOF -diff --git a/file1 b/file2 -index $file1..$file2 100644 ---- a/file1 -+++ b/file2 -@@ -1,26 +1,25 @@ - #include <stdio.h> - -+int fib(int n) -+{ -+ if(n > 2) -+ { -+ return fib(n-1) + fib(n-2); -+ } -+ return 1; -+} -+ - // Frobs foo heartily - int frobnitz(int foo) - { - int i; - for(i = 0; i < 10; i++) - { -- printf("Your answer is: "); - printf("%d\n", foo); - } - } - --int fact(int n) --{ -- if(n > 1) -- { -- return fact(n-1) * n; -- } -- return 1; --} -- - int main(int argc, char **argv) - { -- frobnitz(fact(10)); -+ frobnitz(fib(10)); - } -EOF - - STRATEGY=$1 - - test_expect_success "$STRATEGY diff" ' - test_must_fail git diff --no-index "--$STRATEGY" file1 file2 > output && - test_cmp expect output - ' - - test_expect_success "$STRATEGY diff output is valid" ' - mv file2 expect && - git apply < output && - test_cmp expect file2 - ' -} - -test_diff_unique() { - cat >uniq1 <<\EOF -1 -2 -3 -4 -5 -6 -EOF - - cat >uniq2 <<\EOF -a -b -c -d -e -f -EOF - - uniq1=$(git rev-parse --short $(git hash-object uniq1)) - uniq2=$(git rev-parse --short $(git hash-object uniq2)) - cat >expect <<EOF -diff --git a/uniq1 b/uniq2 -index $uniq1..$uniq2 100644 ---- a/uniq1 -+++ b/uniq2 -@@ -1,6 +1,6 @@ --1 --2 --3 --4 --5 --6 -+a -+b -+c -+d -+e -+f -EOF - - STRATEGY=$1 - - test_expect_success 'completely different files' ' - test_must_fail git diff --no-index "--$STRATEGY" uniq1 uniq2 > output && - test_cmp expect output - ' -} - |