summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2016-04-30 16:57:51 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2016-05-12 17:23:29 +0200
commit86bf5b47916fbe53fe637d7181e93a34d2ad6d0c (patch)
tree4f95236594f067e2cca7a41044dcca4896db5132
parent59d8fa1a62e7c19911fdf7ee9ceb0fdf8fa3331c (diff)
git: update to v2.8.2
Update to git version v2.8.2.

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

Signed-off-by: Christian Hesse <mail@eworm.de>
-rw-r--r--Makefile2
m---------git0
-rw-r--r--scan-tree.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c01701c..a7aa08b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.7.2
+GIT_VER = 2.8.2
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
-Subproject 326e5bc91eecf73234ead29636207bc516573e7
+Subproject 60115f54bda3a127ed3cc8ffc6ab6c771cbceb1
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);