diff options
| author | Jeff King <peff@peff.net> | 2016-02-11 17:26:44 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-16 10:41:03 -0700 |
| commit | dc06dc880013d48f2b09c6b4295419382f3b8230 (patch) | |
| tree | 953e8e5da9ba916154fbb92b48a3654144ee5442 /revision.c | |
| parent | f3badaed5106a16499d0fae31a382f9047b272d7 (diff) | |
| download | git-dc06dc880013d48f2b09c6b4295419382f3b8230.tar.gz | |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/revision.c b/revision.c index f8c30341ed..1ff6709d4b 100644 --- a/revision.c +++ b/revision.c @@ -21,17 +21,17 @@ volatile show_early_output_fn_t show_early_output; -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; |