From 86bf5b47916fbe53fe637d7181e93a34d2ad6d0c Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Sat, 30 Apr 2016 16:57:51 +0200 Subject: 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 --- Makefile | 2 +- git | 2 +- scan-tree.c | 2 +- 3 files changed, 3 insertions(+), 3 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 = -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 index 326e5bc..60115f5 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 326e5bc91eecf73234ead29636207bc516573e79 +Subproject commit 60115f54bda3a127ed3cc8ffc6ab6c771cbceb1b 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); -- cgit v1.2.3-24-g4f1b