diff options
| author | Jeff King <peff@peff.net> | 2013-03-17 04:23:31 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-17 12:52:14 -0700 |
| commit | f7892d181752187513f10b13f2272fa46c9c8422 (patch) | |
| tree | e2c442760956bc096f33a98cc4470a7aefb6ff2f /reachable.c | |
| parent | 75a95490474ab6e991cbbbd10d980498a9109648 (diff) | |
| download | git-f7892d181752187513f10b13f2272fa46c9c8422.tar.gz git-f7892d181752187513f10b13f2272fa46c9c8422.tar.xz | |
use parse_object_or_die instead of die("bad object")
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'reachable.c')
| -rw-r--r-- | reachable.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/reachable.c b/reachable.c index bf7970661..e7e6a1e34 100644 --- a/reachable.c +++ b/reachable.c @@ -152,11 +152,9 @@ static int add_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, 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; |