[PATCH v2 2/4] use parse_object_or_die instead of die("bad object")
- From
Jeff King <peff@peff.net>
- Date
- Mar 17, 2013, 08:23 UTC
- Message-ID
- <20130317082331.GB29550@sigill.intra.peff.net>
- In-Reply-To
- <20130317082139.GA29505@sigill.intra.peff.net>
Some call-sites do:
o = parse_object(sha1);
if (!o)
die("bad object %s", some_name);We can now handle that as a one-liner, and get more consistent output.
In the third case of this patch, it looks like we are losing information, as the existing message also outputs the sha1 hex; however, parse_object will already have written a more specific complaint about the sha1, so there is no point in repeating it here.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/grep.c | 4 +--- builtin/prune.c | 4 +--- reachable.c | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c index 8025964..159e65d 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -820,9 +820,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) unsigned char sha1[20]; /* Is it a rev? */ if (!get_sha1(arg, sha1)) { - struct object *object = parse_object(sha1); - if (!object) - die(_("bad object %s"), arg); + struct object *object = parse_object_or_die(sha1, arg); if (!seen_dashdash) verify_non_filename(prefix, arg); add_object_array(object, arg, &list); diff --git a/builtin/prune.c b/builtin/prune.c index 8cb8b91..85843d4 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -149,9 +149,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) const char *name = *argv++; if (!get_sha1(name, sha1)) { - struct object *object = parse_object(sha1); - if (!object) - die("bad object: %s", name); + struct object *object = parse_object_or_die(sha1, name); add_pending_object(&revs, object, ""); } else diff --git a/reachable.c b/reachable.c index bf79706..e7e6a1e 100644 --- a/reachable.c +++ b/reachable.c @@ -152,11 +152,9 @@ static int add_one_ref(const char *path, const unsigned char *sha1, int flag, vo static int add_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) { - struct object *object = parse_object(sha1); + struct object *object = parse_object_or_die(sha1, path); struct rev_info *revs = (struct rev_info *)cb_data; - if (!object) - die("bad object ref: %s:%s", path, sha1_to_hex(sha1)); add_pending_object(revs, object, ""); return 0;
-- 1.8.2.rc2.7.gef06216