From: list at eworm.de (Christian Hesse)
Subject: [PATCH 1/1] RFC: git: update to v2.17.0.rc1
Date: Thu, 22 Mar 2018 23:43:02 +0100 [thread overview]
Message-ID: <20180322224302.13696-1-list@eworm.de> (raw)
From: Christian Hesse <mail at eworm.de>
Update to git version v2.17.0.rc1. Required changes:
* The function 'typename' has been renamed to 'type_name'
(upstream commit debca9d2fe784193dc2d9f98b5edac605ddfefbb)
Signed-off-by: Christian Hesse <mail at eworm.de>
---
Makefile | 4 ++--
git | 2 +-
ui-shared.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 687069f..a7967d9 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.16.0
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
+GIT_VER = 2.17.0.rc1
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.gz
INSTALL = install
COPYTREE = cp -r
MAN5_TXT = $(wildcard *.5.txt)
diff --git a/git b/git
index 2512f15..085f5f9 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 2512f15446149235156528dafbe75930c712b29e
+Subproject commit 085f5f95a2723e8f9f4d037c01db5b786355ba49
diff --git a/ui-shared.c b/ui-shared.c
index 9d8f66b..ce806f6 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -545,7 +545,7 @@ void cgit_object_link(struct object *obj)
page = "tag";
else
page = "blob";
- name = fmt("%s %s...", typename(obj->type), shortrev);
+ name = fmt("%s %s...", type_name(obj->type), shortrev);
reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
}
reply other threads:[~2018-03-22 22:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180322224302.13696-1-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).