From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/t/t4211/sha1/expect.simple-f | 59 ---------------------------- 1 file changed, 59 deletions(-) delete mode 100644 third_party/git/t/t4211/sha1/expect.simple-f (limited to 'third_party/git/t/t4211/sha1/expect.simple-f') diff --git a/third_party/git/t/t4211/sha1/expect.simple-f b/third_party/git/t/t4211/sha1/expect.simple-f deleted file mode 100644 index a1f5bc49c879..000000000000 --- a/third_party/git/t/t4211/sha1/expect.simple-f +++ /dev/null @@ -1,59 +0,0 @@ -commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2 -Author: Thomas Rast -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,9 +3,9 @@ --int f(int x) -+long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - -commit f04fb20f2c77850996cba739709acc6faecc58f7 -Author: Thomas Rast -Date: Thu Feb 28 10:44:55 2013 +0100 - - change f() - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,8 +3,9 @@ - int f(int x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } -+ return s; - } - -commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a -Author: Thomas Rast -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +3,8 @@ -+int f(int x) -+{ -+ int s = 0; -+ while (x) { -+ x >>= 1; -+ s++; -+ } -+} -- cgit 1.4.1