diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t4211/sha1/expect.multiple-superset | |
parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t4211/sha1/expect.multiple-superset')
-rw-r--r-- | third_party/git/t/t4211/sha1/expect.multiple-superset | 187 |
1 files changed, 0 insertions, 187 deletions
diff --git a/third_party/git/t/t4211/sha1/expect.multiple-superset b/third_party/git/t/t4211/sha1/expect.multiple-superset deleted file mode 100644 index d930b6eec4c4..000000000000 --- a/third_party/git/t/t4211/sha1/expect.multiple-superset +++ /dev/null @@ -1,187 +0,0 @@ -commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:43 2013 +0100 - - change back to complete line - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -4,19 +4,21 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* - * This is only an example! - */ - - int main () - { - printf("%ld\n", f(15)); - return 0; --} -\ No newline at end of file -+} -+ -+/* incomplete lines are bad! */ - -commit 100b61a6f2f720f812620a9d10afb3a960ccb73c -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:10 2013 +0100 - - change to an incomplete line at end - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -4,19 +4,19 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* - * This is only an example! - */ - - int main () - { - printf("%ld\n", f(15)); - return 0; --} -+} -\ No newline at end of file - -commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:41 2013 +0100 - - touch comment - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,19 +3,19 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* -- * A comment. -+ * This is only an example! - */ - - int main () - { - printf("%ld\n", f(15)); - return 0; - } - -commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2 -Author: Thomas Rast <trast@student.ethz.ch> -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,19 +3,19 @@ --int f(int x) -+long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* - * A comment. - */ - - int main () - { -- printf("%d\n", f(15)); -+ printf("%ld\n", f(15)); - return 0; - } - -commit f04fb20f2c77850996cba739709acc6faecc58f7 -Author: Thomas Rast <trast@student.ethz.ch> -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,18 +3,19 @@ - int f(int x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } -+ return s; - } - - /* - * A comment. - */ - - int main () - { - printf("%d\n", f(15)); - return 0; - } - -commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a -Author: Thomas Rast <trast@student.ethz.ch> -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,18 @@ -+int f(int x) -+{ -+ int s = 0; -+ while (x) { -+ x >>= 1; -+ s++; -+ } -+} -+ -+/* -+ * A comment. -+ */ -+ -+int main () -+{ -+ printf("%d\n", f(15)); -+ return 0; -+} |