]> git.cameronkatri.com Git - cgit.git/commitdiff
git: update to v2.8.2
authorChristian Hesse <mail@eworm.de>
Sat, 30 Apr 2016 14:57:51 +0000 (16:57 +0200)
committerJason A. Donenfeld <Jason@zx2c4.com>
Thu, 12 May 2016 15:23:29 +0000 (17:23 +0200)
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>
Makefile
git
scan-tree.c

index c01701cfd71db13b55d48b28897521d7bb773e11..a7aa08b3985d4747029045c9cdca2ae667c7ca75 100644 (file)
--- 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
index 326e5bc91eecf73234ead29636207bc516573e79..60115f54bda3a127ed3cc8ffc6ab6c771cbceb1b 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 326e5bc91eecf73234ead29636207bc516573e79
+Subproject commit 60115f54bda3a127ed3cc8ffc6ab6c771cbceb1b
index 2e87999b11b8f10fdbeab0c9b2b20e22b7b46184..1cb4e5d320d7bd98354cde16948795e46a35baf1 100644 (file)
@@ -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);