diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-04-11 10:46:32 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 10:46:32 +0900 |
| commit | 2d5792f0716605ff0059fe4b5c865d6821c0161e (patch) | |
| tree | f54d21723cf1216001ec9643f91f0d60136a8643 /builtin/prune.c | |
| parent | commit-graph: implement "--append" option (diff) | |
| parent | replace: rename 'new' variables (diff) | |
| download | tgif-2d5792f0716605ff0059fe4b5c865d6821c0161e.tar.xz | |
Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees
* bw/c-plus-plus: (37 commits)
replace: rename 'new' variables
trailer: rename 'template' variables
tempfile: rename 'template' variables
wrapper: rename 'template' variables
environment: rename 'namespace' variables
diff: rename 'template' variables
environment: rename 'template' variables
init-db: rename 'template' variables
unpack-trees: rename 'new' variables
trailer: rename 'new' variables
submodule: rename 'new' variables
split-index: rename 'new' variables
remote: rename 'new' variables
ref-filter: rename 'new' variables
read-cache: rename 'new' variables
line-log: rename 'new' variables
imap-send: rename 'new' variables
http: rename 'new' variables
entry: rename 'new' variables
diffcore-delta: rename 'new' variables
...
Diffstat (limited to 'builtin/prune.c')
| -rw-r--r-- | builtin/prune.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/prune.c b/builtin/prune.c index 4cfec82f40..4394d01c93 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -52,7 +52,7 @@ static int prune_object(const struct object_id *oid, const char *fullpath, if (show_only || verbose) { enum object_type type = sha1_object_info(oid->hash, NULL); printf("%s %s\n", oid_to_hex(oid), - (type > 0) ? typename(type) : "unknown"); + (type > 0) ? type_name(type) : "unknown"); } if (!show_only) unlink_or_warn(fullpath); |