mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'ab/die-with-bug'
Code clean-up. * ab/die-with-bug: object.c: use BUG(...) no die("BUG: ...") in lookup_object_by_type() pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>) strbuf.h: use BUG(...) not die("BUG: ...") pack-objects: use BUG(...) not die("BUG: ...")
This commit is contained in:
commit
159597f5a3
|
@ -3397,7 +3397,7 @@ static void read_object_list_from_stdin(void)
|
|||
if (feof(stdin))
|
||||
break;
|
||||
if (!ferror(stdin))
|
||||
die("BUG: fgets returned NULL, not EOF, not error!");
|
||||
BUG("fgets returned NULL, not EOF, not error!");
|
||||
if (errno != EINTR)
|
||||
die_errno("fgets");
|
||||
clearerr(stdin);
|
||||
|
|
2
object.c
2
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
2
strbuf.h
2
strbuf.h
|
@ -160,7 +160,7 @@ void strbuf_grow(struct strbuf *sb, size_t amount);
|
|||
static inline void strbuf_setlen(struct strbuf *sb, size_t len)
|
||||
{
|
||||
if (len > (sb->alloc ? sb->alloc - 1 : 0))
|
||||
die("BUG: strbuf_setlen() beyond buffer");
|
||||
BUG("strbuf_setlen() beyond buffer");
|
||||
sb->len = len;
|
||||
if (sb->buf != strbuf_slopbuf)
|
||||
sb->buf[len] = '\0';
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue