diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-17 13:50:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-17 13:50:25 -0700 |
| commit | e1fae930193b3e8ff02cee936605625f63e1d1e4 (patch) | |
| tree | 90ad9f3e50d1f1d6acd174ecb4dc0a8bbc28df27 /builtin/prune-packed.c | |
| parent | 0a4ae91d1cf72b1185a46e5f072ac6b25b92350b (diff) | |
| parent | e86ab2c1cd60ec4b9214e5cd8450a474fa175f5c (diff) | |
| download | git-e1fae930193b3e8ff02cee936605625f63e1d1e4.tar.gz | |
Merge branch 'bc/object-id'
"uchar [40]" to "struct object_id" conversion continues.
* bc/object-id:
wt-status: convert to struct object_id
builtin/merge-base: convert to struct object_id
Convert object iteration callbacks to struct object_id
sha1_file: introduce an nth_packed_object_oid function
refs: simplify parsing of reflog entries
refs: convert each_reflog_ent_fn to struct object_id
reflog-walk: convert struct reflog_info to struct object_id
builtin/replace: convert to struct object_id
Convert remaining callers of resolve_refdup to object_id
builtin/merge: convert to struct object_id
builtin/clone: convert to struct object_id
builtin/branch: convert to struct object_id
builtin/grep: convert to struct object_id
builtin/fmt-merge-message: convert to struct object_id
builtin/fast-export: convert to struct object_id
builtin/describe: convert to struct object_id
builtin/diff-tree: convert to struct object_id
builtin/commit: convert to struct object_id
hex: introduce parse_oid_hex
Diffstat (limited to 'builtin/prune-packed.c')
| -rw-r--r-- | builtin/prune-packed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c index 7cf900ea07..c026299e78 100644 --- a/builtin/prune-packed.c +++ b/builtin/prune-packed.c @@ -19,12 +19,12 @@ static int prune_subdir(int nr, const char *path, void *data) return 0; } -static int prune_object(const unsigned char *sha1, const char *path, +static int prune_object(const struct object_id *oid, const char *path, void *data) { int *opts = data; - if (!has_sha1_pack(sha1)) + if (!has_sha1_pack(oid->hash)) return 0; if (*opts & PRUNE_PACKED_DRY_RUN) |
