Browse Source

Convert remaining die*(BUG) messages

These were not caught by the previous commit, as they did not match the
regular expression.

While at it, remove the localization from one instance: we never want
BUG() messages to be translated, as they target Git developers, not the
end user (hence it would be quite unhelpful to not only burden the
translators, but then even end up with a bug report in a language that
no core Git contributor understands).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 7 years ago committed by Junio C Hamano
parent
commit
c3c3486b24
  1. 2
      git-compat-util.h
  2. 2
      pathspec.c
  3. 2
      submodule.c
  4. 6
      vcs-svn/fast_export.c

2
git-compat-util.h

@ -1052,7 +1052,7 @@ int git_qsort_s(void *base, size_t nmemb, size_t size, @@ -1052,7 +1052,7 @@ int git_qsort_s(void *base, size_t nmemb, size_t size,

#define QSORT_S(base, n, compar, ctx) do { \
if (qsort_s((base), (n), sizeof(*(base)), compar, ctx)) \
die("BUG: qsort_s() failed"); \
BUG("qsort_s() failed"); \
} while (0)

#ifndef REG_STARTEND

2
pathspec.c

@ -486,7 +486,7 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags, @@ -486,7 +486,7 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
/* sanity checks, pathspec matchers assume these are sane */
if (item->nowildcard_len > item->len ||
item->prefix > item->len) {
die ("BUG: error initializing pathspec_item");
BUG("error initializing pathspec_item");
}
}


2
submodule.c

@ -2043,7 +2043,7 @@ const char *get_superproject_working_tree(void) @@ -2043,7 +2043,7 @@ const char *get_superproject_working_tree(void)

if (super_sub_len > cwd_len ||
strcmp(&cwd[cwd_len - super_sub_len], super_sub))
die (_("BUG: returned path string doesn't match cwd?"));
BUG("returned path string doesn't match cwd?");

super_wt = xstrdup(cwd);
super_wt[cwd_len - super_sub_len] = '\0';

6
vcs-svn/fast_export.c

@ -320,7 +320,8 @@ const char *fast_export_read_path(const char *path, uint32_t *mode_out) @@ -320,7 +320,8 @@ const char *fast_export_read_path(const char *path, uint32_t *mode_out)
err = fast_export_ls(path, mode_out, &buf);
if (err) {
if (errno != ENOENT)
die_errno("BUG: unexpected fast_export_ls error");
BUG("unexpected fast_export_ls error: %s",
strerror(errno));
/* Treat missing paths as directories. */
*mode_out = S_IFDIR;
return NULL;
@ -338,7 +339,8 @@ void fast_export_copy(uint32_t revision, const char *src, const char *dst) @@ -338,7 +339,8 @@ void fast_export_copy(uint32_t revision, const char *src, const char *dst)
err = fast_export_ls_rev(revision, src, &mode, &data);
if (err) {
if (errno != ENOENT)
die_errno("BUG: unexpected fast_export_ls_rev error");
BUG("unexpected fast_export_ls_rev error: %s",
strerror(errno));
fast_export_delete(dst);
return;
}

Loading…
Cancel
Save