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 /merge-recursive.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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 8d96e94bd5..e64b4b9d03 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -392,7 +392,7 @@ struct tree *write_tree_from_memory(struct merge_options *o) fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce), (int)ce_namelen(ce), ce->name); } - die("BUG: unmerged index entries in merge-recursive.c"); + BUG("unmerged index entries in merge-recursive.c"); } if (!active_cache_tree) @@ -1166,7 +1166,7 @@ static int merge_file_1(struct merge_options *o, break; } } else - die("BUG: unsupported object type in the tree"); + BUG("unsupported object type in the tree"); } if (result->merge) @@ -2419,7 +2419,7 @@ static int process_renames(struct merge_options *o, const char *ren2_dst = ren2->pair->two->path; enum rename_type rename_type; if (strcmp(ren1_src, ren2_src) != 0) - die("BUG: ren1_src != ren2_src"); + BUG("ren1_src != ren2_src"); ren2->dst_entry->processed = 1; ren2->processed = 1; if (strcmp(ren1_dst, ren2_dst) != 0) { @@ -2453,7 +2453,7 @@ static int process_renames(struct merge_options *o, ren2 = lookup->util; ren2_dst = ren2->pair->two->path; if (strcmp(ren1_dst, ren2_dst) != 0) - die("BUG: ren1_dst != ren2_dst"); + BUG("ren1_dst != ren2_dst"); clean_merge = 0; ren2->processed = 1; @@ -3057,7 +3057,7 @@ static int process_entry(struct merge_options *o, */ remove_file(o, 1, path, !a_mode); } else - die("BUG: fatal merge failure, shouldn't happen."); + BUG("fatal merge failure, shouldn't happen."); return clean_merge; } @@ -3135,7 +3135,7 @@ int merge_trees(struct merge_options *o, for (i = 0; i < entries->nr; i++) { struct stage_data *e = entries->items[i].util; if (!e->processed) - die("BUG: unprocessed path??? %s", + BUG("unprocessed path??? %s", entries->items[i].string); } |