diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-15 08:36:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-15 09:29:44 (GMT) |
| commit | d2dadfe890b5da6f65fe061a414b6ec67c5efe9c (patch) | |
| tree | 494ca607f5ff4dd4135e84b4513567fcb79f4a0d /builtin-log.c | |
| parent | 544ddb045a4bd49da9ffc1d9da80bdc0d71b2518 (diff) | |
| download | git-d2dadfe890b5da6f65fe061a414b6ec67c5efe9c.zip git-d2dadfe890b5da6f65fe061a414b6ec67c5efe9c.tar.gz git-d2dadfe890b5da6f65fe061a414b6ec67c5efe9c.tar.bz2 | |
git-show: do not segfault when showing a bad tag
When a tag points at a bad or nonexistent object, we should diagnose the
breakage and exit. An earlier commit 4f3dcc2 (Fix 'git show' on signed
tag of signed tag of commit, 2008-07-01) lost this check and made it
segfault instead; not good.
This fixes it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c index 2efe593..db71e0d 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -356,7 +356,13 @@ int cmd_show(int argc, const char **argv, const char *prefix) t->tag, diff_get_color_opt(&rev.diffopt, DIFF_RESET)); ret = show_object(o->sha1, 1, &rev); - objects[i].item = parse_object(t->tagged->sha1); + if (ret) + break; + o = parse_object(t->tagged->sha1); + if (!o) + ret = error("Could not read object %s", + sha1_to_hex(t->tagged->sha1)); + objects[i].item = o; i--; break; } |