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 /builtin | |
| parent | f3badaed5106a16499d0fae31a382f9047b272d7 (diff) | |
| download | git-dc06dc880013d48f2b09c6b4295419382f3b8230.tar.gz git-dc06dc880013d48f2b09c6b4295419382f3b8230.tar.xz | |
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')
| -rw-r--r-- | builtin/pack-objects.c | 4 | ||||
| -rw-r--r-- | builtin/rev-list.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index c067107a6..c886258b7 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) { diff --git a/builtin/rev-list.c b/builtin/rev-list.c index c0b4b5365..3d3a2665f 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -178,7 +178,7 @@ static void finish_commit(struct commit *commit, void *data) } static void finish_object(struct object *obj, - const struct name_path *path, const char *name, + struct strbuf *path, const char *name, void *cb_data) { struct rev_list_info *info = cb_data; @@ -189,7 +189,7 @@ static void finish_object(struct object *obj, } static void show_object(struct object *obj, - const struct name_path *path, const char *component, + struct strbuf *path, const char *component, void *cb_data) { struct rev_list_info *info = cb_data; |