From: list at eworm.de (Christian Hesse)
Subject: [PATCH 1/1] git: update to v2.2.0
Date: Thu, 27 Nov 2014 01:30:56 +0100 [thread overview]
Message-ID: <1417048256-480-1-git-send-email-list@eworm.de> (raw)
From: Christian Hesse <mail at eworm.de>
Update to git version v2.2.0, including API changes.
---
Makefile | 2 +-
cgit.c | 2 +-
git | 2 +-
ui-log.c | 4 ++--
ui-repolist.c | 8 +++++---
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 6a8a125..975009f 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.0
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 8c4517d..d70de72 100644
--- a/cgit.c
+++ b/cgit.c
@@ -453,7 +453,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
index 32f5660..b260d26 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 32f56600bb6ac6fc57183e79d2c1515dfa56672f
+Subproject commit b260d265e189728b26e50506ac6ffab6a7d588da
diff --git a/ui-log.c b/ui-log.c
index bcdb666..e5faf59 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..0e57c53 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -17,16 +17,18 @@ 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);
+ strbuf_reset(&date_buf);
+ 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;
}
--
2.1.3
next reply other threads:[~2014-11-27 0:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-27 0:30 list [this message]
2014-11-27 9:05 ` john
2014-11-27 20:35 ` list
2014-11-27 20:41 ` list
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1417048256-480-1-git-send-email-list@eworm.de \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).