From f4609b896fac842433bd495c166d5987852a6a73 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 21 Nov 2020 19:20:35 +0100 Subject: merge(3p/git): Merge git subtree at v2.29.2 This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb --- third_party/git/t/t4211/expect.simple-f | 59 --------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 third_party/git/t/t4211/expect.simple-f (limited to 'third_party/git/t/t4211/expect.simple-f') diff --git a/third_party/git/t/t4211/expect.simple-f b/third_party/git/t/t4211/expect.simple-f deleted file mode 100644 index a1f5bc49c879..000000000000 --- a/third_party/git/t/t4211/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