Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Jul 2018 13:26:30 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r474079 - head/devel/cgit/files
Message-ID:  <201807071326.w67DQUqS025720@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sat Jul  7 13:26:30 2018
New Revision: 474079
URL: https://svnweb.freebsd.org/changeset/ports/474079

Log:
  devel/cgit: Fix patch
  
  PR:		227536

Modified:
  head/devel/cgit/files/patch-git-2.17

Modified: head/devel/cgit/files/patch-git-2.17
==============================================================================
--- head/devel/cgit/files/patch-git-2.17	Sat Jul  7 13:22:59 2018	(r474078)
+++ head/devel/cgit/files/patch-git-2.17	Sat Jul  7 13:26:30 2018	(r474079)
@@ -28,35 +28,3 @@ index 9d8f66b..ce806f6 100644
  
 -- 
 2.17.0
-
-From 3e7e7a886006376ba68e959addaea1eabbb37482 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Mon, 2 Apr 2018 23:09:01 +0200
-Subject: [PATCH] git: update to v2.17.0
-
-Update to git version v2.17.0. Required changes:
-
-* The function 'typename' has been renamed to 'type_name'
-  (upstream commit debca9d2fe784193dc2d9f98b5edac605ddfefbb)
----
- Makefile    | 2 +-
- git         | 2 +-
- ui-shared.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git ui-shared.c ui-shared.c
-index 9d8f66b..ce806f6 100644
---- ui-shared.c
-+++ 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);
- }
- 
--- 
-2.17.0
-



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807071326.w67DQUqS025720>