summaryrefslogtreecommitdiff
path: root/builtin/pack-objects.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-02-11 22:26:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-12 20:51:15 (GMT)
commitbd64516aca4d4e22acb33c71429d293a14d355cf (patch)
treeb5ecc69581925bd95e262aa2b203fb3e63756091 /builtin/pack-objects.c
parent13528ab37cadb4d4f7384d0449489760912904b8 (diff)
downloadgit-bd64516aca4d4e22acb33c71429d293a14d355cf.zip
git-bd64516aca4d4e22acb33c71429d293a14d355cf.tar.gz
git-bd64516aca4d4e22acb33c71429d293a14d355cf.tar.bz2
list-objects: drop name_path entirely
In the previous commit, we left name_path as a thin wrapper around a strbuf. This patch drops it entirely. As a result, every show_object_fn callback needs to be adjusted. However, none of their code needs to be changed at all, because the only use was to pass it to path_name(), which now handles the bare strbuf. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
-rw-r--r--builtin/pack-objects.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 4dae5b1..8bbb9bd 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2285,7 +2285,7 @@ static void show_commit(struct commit *commit, void *data)
}
static void show_object(struct object *obj,
- const struct name_path *path, const char *last,
+ struct strbuf *path, const char *last,
void *data)
{
char *name = path_name(path, last);
@@ -2480,7 +2480,7 @@ static int get_object_list_from_bitmap(struct rev_info *revs)
}
static void record_recent_object(struct object *obj,
- const struct name_path *path,
+ struct strbuf *path,
const char *last,
void *data)
{