summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2014-12-19 00:28:34 -0700
committerJason A. Donenfeld <Jason@zx2c4.com>2014-12-23 18:53:03 -0700
commit17838ec6304198811df97402f11c185f8f0e10bd (patch)
treebf462dcdb2b974d45c72b8f4fb559dfde1b51027
parent10c5680efb02b534108b174c0967d08ae3e46927 (diff)
git: update to v2.2.1
Update to git version v2.2.1, including API changes. Signed-off-by: Christian Hesse <mail@eworm.de>
-rw-r--r--Makefile2
-rw-r--r--cgit.c2
m---------git0
-rw-r--r--ui-log.c4
-rw-r--r--ui-repolist.c7
5 files changed, 8 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 6a8a125..38bf595 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.0.4
+GIT_VER = 2.2.1
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
INSTALL = install
COPYTREE = cp -r
diff --git a/cgit.c b/cgit.c
index db60107..796cb7f 100644
--- a/cgit.c
+++ b/cgit.c
@@ -457,7 +457,7 @@ static char *guess_defbranch(void)
const char *ref;
unsigned char sha1[20];
- ref = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
+ ref = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
if (!ref || !starts_with(ref, "refs/heads/"))
return "master";
return xstrdup(ref + 11);
diff --git a/git b/git
-Subproject 32f56600bb6ac6fc57183e79d2c1515dfa56672
+Subproject 9b7cbb315923e61bb0c4297c701089f30e11675
diff --git a/ui-log.c b/ui-log.c
index ad2f5fc..657ff3c 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -56,11 +56,11 @@ static void inspect_files(struct diff_filepair *pair)
void show_commit_decorations(struct commit *commit)
{
- struct name_decoration *deco;
+ const struct name_decoration *deco;
static char buf[1024];
buf[sizeof(buf) - 1] = 0;
- deco = lookup_decoration(&name_decoration, &commit->object);
+ deco = get_name_decoration(&commit->object);
html("<span class='decoration'>");
while (deco) {
if (starts_with(deco->name, "refs/heads/")) {
diff --git a/ui-repolist.c b/ui-repolist.c
index c2bcce1..49c991f 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -17,16 +17,17 @@ static time_t read_agefile(char *path)
time_t result;
size_t size;
char *buf;
- static char buf2[64];
+ struct strbuf date_buf = STRBUF_INIT;
if (readfile(path, &buf, &size))
return -1;
- if (parse_date(buf, buf2, sizeof(buf2)) > 0)
- result = strtoul(buf2, NULL, 10);
+ if (parse_date(buf, &date_buf) == 0)
+ result = strtoul(date_buf.buf, NULL, 10);
else
result = 0;
free(buf);
+ strbuf_release(&date_buf);
return result;
}