[PATCH 3/2] replace die("BUG: ...") with BUG("...")

From

Junio C Hamano <gitster@pobox.com>

Date

Dec 7, 2021, 00:24 UTC

Message-ID

<xmqqsfv5b6u6.fsf@gitster.g>

In-Reply-To

<cover-0.2-00000000000-20211206T162442Z-avarab@gmail.com>

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

> A trivial clean-up to change a couple of die() uses to BUG() where
> appropriate. This is split off from an earlier RFC series I sent
> in[1], as the range-diff to the relevant patches there shown there are
> no changes since then.
>
> 1. https://lore.kernel.org/git/RFC-patch-07.21-3f897bf6b0e-20211115T220831Z-avarab@gmail.com/
>
> Ævar Arnfjörð Bjarmason (2):
>   pack-objects: use BUG(...) not die("BUG: ...")
>   strbuf.h: use BUG(...) not die("BUG: ...")
>
>  builtin/pack-objects.c | 2 +-
>  strbuf.h               | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> Range-diff:
> 1:  2507ea71700 = 1:  2a17ed9f135 pack-objects: use BUG(...) not die("BUG: ...")
> 2:  5dedcee3fb0 = 2:  ab89fec50c3 strbuf.h: use BUG(...) not die("BUG: ...")

 object.c    | 2 +-
 pathspec.h  | 3 +--
 tree-diff.c | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git c/object.c w/object.c
index 23a24e678a..4be82c1e7b 100644
--- c/object.c
+++ w/object.c
@@ -199,7 +199,7 @@ struct object *lookup_object_by_type(struct repository *r,
 	case OBJ_BLOB:
 		return (struct object *)lookup_blob(r, oid);
 	default:
-		die("BUG: unknown object type %d", type);
+		BUG("unknown object type %d", type);
 	}
 }
 
diff --git c/pathspec.h w/pathspec.h
index 2341dc9901..402ebb8080 100644
--- c/pathspec.h
+++ w/pathspec.h
@@ -58,8 +58,7 @@ struct pathspec {
 #define GUARD_PATHSPEC(ps, mask) \
 	do { \
 		if ((ps)->magic & ~(mask))	       \
-			die("BUG:%s:%d: unsupported magic %x",	\
-			    __FILE__, __LINE__, (ps)->magic & ~(mask)); \
+			BUG("unsupported magic %x", (ps)->magic & ~(mask)); \
 	} while (0)
 
 /* parse_pathspec flags */
diff --git c/tree-diff.c w/tree-diff.c
index 437c98a70e..69031d7cba 100644
--- c/tree-diff.c
+++ w/tree-diff.c
@@ -603,8 +603,7 @@ static void try_to_follow_renames(const struct object_id *old_oid,
 	 * about dry-run mode and returns wildcard info.
 	 */
 	if (opt->pathspec.has_wildcard)
-		die("BUG:%s:%d: wildcards are not supported",
-		    __FILE__, __LINE__);
+		BUG("wildcards are not supported");
 #endif
 
 	/* Remove the file creation entry from the diff queue, and remember it */