about summary refs log tree commit diff stats
path: root/ui-clone.c
diff options
context:
space:
mode:
authorChristian Hesse2015-07-28 10:42:01 +0200
committerJason A. Donenfeld2015-08-12 14:09:05 +0200
commitde83de276bef7509ab8255682595ad4521f3a193 (patch)
treee40e61142c47dea3536ca88d53648e82929b6719 /ui-clone.c
parentFix processing of repo.hide and repo.ignore (diff)
downloadcgit-de83de276bef7509ab8255682595ad4521f3a193.tar.gz
cgit-de83de276bef7509ab8255682595ad4521f3a193.zip
git: update to v2.5.0
Update to git version v2.5.0.

* Upstream commit 5455ee0573a22bb793a7083d593ae1ace909cd4c (Merge branch
  'bc/object-id') changed API:

  for_each_ref() callback functions were taught to name the objects
  not with "unsigned char sha1[20]" but with "struct object_id".

* Upstream commit dcf692625ac569fefbe52269061230f4fde10e47 (path.c: make
  get_pathname() call sites return const char *)

Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'ui-clone.c')
-rw-r--r--ui-clone.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui-clone.c b/ui-clone.c index e35d3d3..e4ddd34 100644 --- a/ui-clone.c +++ b/ui-clone.c
@@ -12,15 +12,15 @@
12#include "html.h" 12#include "html.h"
13#include "ui-shared.h" 13#include "ui-shared.h"
14 14
15static int print_ref_info(const char *refname, const unsigned char *sha1, 15static int print_ref_info(const char *refname, const struct object_id *oid,
16 int flags, void *cb_data) 16 int flags, void *cb_data)
17{ 17{
18 struct object *obj; 18 struct object *obj;
19 19
20 if (!(obj = parse_object(sha1))) 20 if (!(obj = parse_object(oid->hash)))
21 return 0; 21 return 0;
22 22
23 htmlf("%s\t%s\n", sha1_to_hex(sha1), refname); 23 htmlf("%s\t%s\n", oid_to_hex(oid), refname);
24 if (obj->type == OBJ_TAG) { 24 if (obj->type == OBJ_TAG) {
25 if (!(obj = deref_tag(obj, refname, 0))) 25 if (!(obj = deref_tag(obj, refname, 0)))
26 return 0; 26 return 0;
@@ -50,7 +50,7 @@ static void print_pack_info(void)
50 } 50 }
51} 51}
52 52
53static void send_file(char *path) 53static void send_file(const char *path)
54{ 54{
55 struct stat st; 55 struct stat st;
56 56