diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:07 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:07 +0900 |
| commit | 50f08db5941755b69012378bfc86f6b8ee98edf4 (patch) | |
| tree | d403a1dbf522fdaab4cf6b9b508a08b3965828e2 /builtin/cat-file.c | |
| parent | Merge branch 'rs/no-null-ptr-arith-in-fast-export' (diff) | |
| parent | BUG_exit_code: fix sparse "symbol not declared" warning (diff) | |
| download | tgif-50f08db5941755b69012378bfc86f6b8ee98edf4.tar.xz | |
Merge branch 'js/use-bug-macro'
Developer support update, by using BUG() macro instead of die() to
mark codepaths that should not happen more clearly.
* js/use-bug-macro:
BUG_exit_code: fix sparse "symbol not declared" warning
Convert remaining die*(BUG) messages
Replace all die("BUG: ...") calls by BUG() ones
run-command: use BUG() to report bugs, not die()
test-tool: help verifying BUG() code paths
Diffstat (limited to 'builtin/cat-file.c')
| -rw-r--r-- | builtin/cat-file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index b8ecbea98e..665b581949 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -312,7 +312,7 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d die("could not convert '%s' %s", oid_to_hex(oid), data->rest); } else - die("BUG: invalid cmdmode: %c", opt->cmdmode); + BUG("invalid cmdmode: %c", opt->cmdmode); batch_write(opt, contents, size); free(contents); } else if (stream_blob_to_fd(1, oid, NULL, 0) < 0) @@ -387,7 +387,7 @@ static void batch_one_object(const char *obj_name, struct batch_options *opt, (uintmax_t)strlen(obj_name), obj_name); break; default: - die("BUG: unknown get_sha1_with_context result %d\n", + BUG("unknown get_sha1_with_context result %d\n", result); break; } |