[PATCH 1/1] RFC: git: update to v2.8.0-rc0

Christian Hesse list at eworm.de
Sat Feb 27 19:11:56 CET 2016


From: Christian Hesse <mail at eworm.de>

Update to git version v2.8.0-rc0.

* Upstream commit 1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2 (strbuf: give
  strbuf_getline() to the "most text friendly" variant) changed API.

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile    | 4 ++--
 git         | 2 +-
 scan-tree.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c01701c..4a78312 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.7.2
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
+GIT_VER = 2.8.0.rc0
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.gz
 INSTALL = install
 COPYTREE = cp -r
 MAN5_TXT = $(wildcard *.5.txt)
diff --git a/git b/git
index 326e5bc..f02fbc4 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 326e5bc91eecf73234ead29636207bc516573e79
+Subproject commit f02fbc4f9433937ee0463d0342d6d7d97e1f6f1e
diff --git a/scan-tree.c b/scan-tree.c
index 2e87999..1cb4e5d 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -246,7 +246,7 @@ void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn
 			projectsfile, strerror(errno), errno);
 		return;
 	}
-	while (strbuf_getline(&line, projects, '\n') != EOF) {
+	while (strbuf_getline(&line, projects) != EOF) {
 		if (!line.len)
 			continue;
 		strbuf_insert(&line, 0, "/", 1);
-- 
2.7.2



More information about the CGit mailing list