diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-18 14:46:17 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-18 14:46:17 -0700 |
commit | 9824a388e53ba0951e38f246038fa0ef6fda3397 (patch) | |
tree | afae88c319c71b70dfd76de729222af8490f2dd0 /revision.c | |
parent | 5758b25da43c401cad33f3304f78084a0305d21c (diff) | |
parent | cf2ab916afa4231f7e9db31796e7c0f712ff6ad1 (diff) | |
download | git-9824a388e53ba0951e38f246038fa0ef6fda3397.tar.gz |
Merge branch 'lt/pack-object-memuse'
* lt/pack-object-memuse:
show_object(): push path_name() call further down
process_{tree,blob}: show objects without buffering
Conflicts:
builtin-pack-objects.c
builtin-rev-list.c
list-objects.c
list-objects.h
upload-pack.c
Diffstat (limited to 'revision.c')
-rw-r--r-- | revision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/revision.c b/revision.c index b6215cc72c..bd0ea34af0 100644 --- a/revision.c +++ b/revision.c @@ -15,9 +15,9 @@ volatile show_early_output_fn_t show_early_output; -static char *path_name(struct name_path *path, const char *name) +char *path_name(const struct name_path *path, const char *name) { - struct name_path *p; + const struct name_path *p; char *n, *m; int nlen = strlen(name); int len = nlen + 1; |