diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 07:04:07 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 07:04:07 +0200 |
| commit | 50f08db5941755b69012378bfc86f6b8ee98edf4 (patch) | |
| tree | d403a1dbf522fdaab4cf6b9b508a08b3965828e2 /unpack-trees.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 | git-50f08db5941755b69012378bfc86f6b8ee98edf4.tar.xz git-50f08db5941755b69012378bfc86f6b8ee98edf4.zip | |
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 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 0f01be6004..7051fcf7d8 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -398,7 +398,7 @@ static int check_updates(struct unpack_trees_options *o) if (ce->ce_flags & CE_UPDATE) { if (ce->ce_flags & CE_WT_REMOVE) - die("BUG: both update and delete flags are set on %s", + BUG("both update and delete flags are set on %s", ce->name); display_progress(progress, ++cnt); ce->ce_flags &= ~CE_UPDATE; |