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 /sha1-name.c | |
| parent | bef896e4ab414312cdca493e0306d66ec7246b01 (diff) | |
| parent | 746ea4adc6cd88ad5f5af6beebace581fe489b2f (diff) | |
| download | git-50f08db5941755b69012378bfc86f6b8ee98edf4.tar.gz | |
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 'sha1-name.c')
| -rw-r--r-- | sha1-name.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sha1-name.c b/sha1-name.c index 80030b159a..60b8a935cc 100644 --- a/sha1-name.c +++ b/sha1-name.c @@ -384,7 +384,7 @@ static int get_short_oid(const char *name, int len, struct object_id *oid, return -1; if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS)) - die("BUG: multiple get_short_oid disambiguator flags"); + BUG("multiple get_short_oid disambiguator flags"); if (flags & GET_OID_COMMIT) ds.fn = disambiguate_commit_only; @@ -1729,6 +1729,6 @@ void maybe_die_on_misspelt_object_name(const char *name, const char *prefix) int get_oid_with_context(const char *str, unsigned flags, struct object_id *oid, struct object_context *oc) { if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE) - die("BUG: incompatible flags for get_sha1_with_context"); + BUG("incompatible flags for get_sha1_with_context"); return get_oid_with_context_1(str, flags, NULL, oid, oc); } |