summaryrefslogtreecommitdiff
path: root/revision.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 /revision.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 'revision.c')
-rw-r--r--revision.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/revision.c b/revision.c
index 8dd0950..3c84781 100644
--- a/revision.c
+++ b/revision.c
@@ -25,17 +25,17 @@ volatile show_early_output_fn_t show_early_output;
static const char *term_bad;
static const char *term_good;
-char *path_name(const struct name_path *path, const char *name)
+char *path_name(struct strbuf *path, const char *name)
{
struct strbuf ret = STRBUF_INIT;
if (path)
- strbuf_addbuf(&ret, path->base);
+ strbuf_addbuf(&ret, path);
strbuf_addstr(&ret, name);
return strbuf_detach(&ret, NULL);
}
void show_object_with_name(FILE *out, struct object *obj,
- const struct name_path *path, const char *component)
+ struct strbuf *path, const char *component)
{
char *name = path_name(path, component);
char *p;