diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-06 22:10:09 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 15:12:57 +0900 |
| commit | 1e43ed986775d8e8ecaef4dac8b98dcbae6298c1 (patch) | |
| tree | ff277db9f9c9fbee8f4a87dc7f6cb8ea0c97a332 /ref-filter.c | |
| parent | 7422ab50d1011b2b26b59bf11b91a1202618f3e5 (diff) | |
| download | git-1e43ed986775d8e8ecaef4dac8b98dcbae6298c1.tar.gz git-1e43ed986775d8e8ecaef4dac8b98dcbae6298c1.tar.xz | |
Convert remaining callers of lookup_commit_reference* to object_id
There are a small number of remaining callers of lookup_commit_reference
and lookup_commit_reference_gently that still need to be converted to
struct object_id. Convert these.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ref-filter.c b/ref-filter.c index 3a640448f..47cce0a18 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -2090,7 +2090,7 @@ int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset) int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset) { struct ref_filter *rf = opt->value; - unsigned char sha1[20]; + struct object_id oid; int no_merged = starts_with(opt->long_name, "no"); if (rf->merge) { @@ -2105,10 +2105,10 @@ int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset) ? REF_FILTER_MERGED_OMIT : REF_FILTER_MERGED_INCLUDE; - if (get_sha1(arg, sha1)) + if (get_oid(arg, &oid)) die(_("malformed object name %s"), arg); - rf->merge_commit = lookup_commit_reference_gently(sha1, 0); + rf->merge_commit = lookup_commit_reference_gently(oid.hash, 0); if (!rf->merge_commit) return opterror(opt, "must point to a commit", 0); |