merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
Vincent Ambo
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
126
third_party/git/builtin/fsck.c
vendored
126
third_party/git/builtin/fsck.c
vendored
|
|
@ -50,40 +50,20 @@ static int name_objects;
|
|||
#define ERROR_REFS 010
|
||||
#define ERROR_COMMIT_GRAPH 020
|
||||
|
||||
static const char *describe_object(struct object *obj)
|
||||
static const char *describe_object(const struct object_id *oid)
|
||||
{
|
||||
static struct strbuf bufs[] = {
|
||||
STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
|
||||
};
|
||||
static int b = 0;
|
||||
struct strbuf *buf;
|
||||
char *name = NULL;
|
||||
|
||||
if (name_objects)
|
||||
name = lookup_decoration(fsck_walk_options.object_names, obj);
|
||||
|
||||
buf = bufs + b;
|
||||
b = (b + 1) % ARRAY_SIZE(bufs);
|
||||
strbuf_reset(buf);
|
||||
strbuf_addstr(buf, oid_to_hex(&obj->oid));
|
||||
if (name)
|
||||
strbuf_addf(buf, " (%s)", name);
|
||||
|
||||
return buf->buf;
|
||||
return fsck_describe_object(&fsck_walk_options, oid);
|
||||
}
|
||||
|
||||
static const char *printable_type(struct object *obj)
|
||||
static const char *printable_type(const struct object_id *oid,
|
||||
enum object_type type)
|
||||
{
|
||||
const char *ret;
|
||||
|
||||
if (obj->type == OBJ_NONE) {
|
||||
enum object_type type = oid_object_info(the_repository,
|
||||
&obj->oid, NULL);
|
||||
if (type > 0)
|
||||
object_as_type(the_repository, obj, type, 0);
|
||||
}
|
||||
if (type == OBJ_NONE)
|
||||
type = oid_object_info(the_repository, oid, NULL);
|
||||
|
||||
ret = type_name(obj->type);
|
||||
ret = type_name(type);
|
||||
if (!ret)
|
||||
ret = _("unknown");
|
||||
|
||||
|
|
@ -118,26 +98,32 @@ static int objerror(struct object *obj, const char *err)
|
|||
errors_found |= ERROR_OBJECT;
|
||||
/* TRANSLATORS: e.g. error in tree 01bfda: <more explanation> */
|
||||
fprintf_ln(stderr, _("error in %s %s: %s"),
|
||||
printable_type(obj), describe_object(obj), err);
|
||||
printable_type(&obj->oid, obj->type),
|
||||
describe_object(&obj->oid), err);
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int fsck_error_func(struct fsck_options *o,
|
||||
struct object *obj, int type, const char *message)
|
||||
const struct object_id *oid,
|
||||
enum object_type object_type,
|
||||
int msg_type, const char *message)
|
||||
{
|
||||
switch (type) {
|
||||
switch (msg_type) {
|
||||
case FSCK_WARN:
|
||||
/* TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> */
|
||||
fprintf_ln(stderr, _("warning in %s %s: %s"),
|
||||
printable_type(obj), describe_object(obj), message);
|
||||
printable_type(oid, object_type),
|
||||
describe_object(oid), message);
|
||||
return 0;
|
||||
case FSCK_ERROR:
|
||||
/* TRANSLATORS: e.g. error in tree 01bfda: <more explanation> */
|
||||
fprintf_ln(stderr, _("error in %s %s: %s"),
|
||||
printable_type(obj), describe_object(obj), message);
|
||||
printable_type(oid, object_type),
|
||||
describe_object(oid), message);
|
||||
return 1;
|
||||
default:
|
||||
BUG("%d (FSCK_IGNORE?) should never trigger this callback", type);
|
||||
BUG("%d (FSCK_IGNORE?) should never trigger this callback",
|
||||
msg_type);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -155,7 +141,8 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
|
|||
if (!obj) {
|
||||
/* ... these references to parent->fld are safe here */
|
||||
printf_ln(_("broken link from %7s %s"),
|
||||
printable_type(parent), describe_object(parent));
|
||||
printable_type(&parent->oid, parent->type),
|
||||
describe_object(&parent->oid));
|
||||
printf_ln(_("broken link from %7s %s"),
|
||||
(type == OBJ_ANY ? _("unknown") : type_name(type)),
|
||||
_("unknown"));
|
||||
|
|
@ -183,10 +170,10 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
|
|||
if (parent && !has_object_file(&obj->oid)) {
|
||||
printf_ln(_("broken link from %7s %s\n"
|
||||
" to %7s %s"),
|
||||
printable_type(parent),
|
||||
describe_object(parent),
|
||||
printable_type(obj),
|
||||
describe_object(obj));
|
||||
printable_type(&parent->oid, parent->type),
|
||||
describe_object(&parent->oid),
|
||||
printable_type(&obj->oid, obj->type),
|
||||
describe_object(&obj->oid));
|
||||
errors_found |= ERROR_REACHABLE;
|
||||
}
|
||||
return 1;
|
||||
|
|
@ -292,8 +279,9 @@ static void check_reachable_object(struct object *obj)
|
|||
return;
|
||||
if (has_object_pack(&obj->oid))
|
||||
return; /* it is in pack - forget about it */
|
||||
printf_ln(_("missing %s %s"), printable_type(obj),
|
||||
describe_object(obj));
|
||||
printf_ln(_("missing %s %s"),
|
||||
printable_type(&obj->oid, obj->type),
|
||||
describe_object(&obj->oid));
|
||||
errors_found |= ERROR_REACHABLE;
|
||||
return;
|
||||
}
|
||||
|
|
@ -318,8 +306,9 @@ static void check_unreachable_object(struct object *obj)
|
|||
* since this is something that is prunable.
|
||||
*/
|
||||
if (show_unreachable) {
|
||||
printf_ln(_("unreachable %s %s"), printable_type(obj),
|
||||
describe_object(obj));
|
||||
printf_ln(_("unreachable %s %s"),
|
||||
printable_type(&obj->oid, obj->type),
|
||||
describe_object(&obj->oid));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -337,12 +326,13 @@ static void check_unreachable_object(struct object *obj)
|
|||
*/
|
||||
if (!(obj->flags & USED)) {
|
||||
if (show_dangling)
|
||||
printf_ln(_("dangling %s %s"), printable_type(obj),
|
||||
describe_object(obj));
|
||||
printf_ln(_("dangling %s %s"),
|
||||
printable_type(&obj->oid, obj->type),
|
||||
describe_object(&obj->oid));
|
||||
if (write_lost_and_found) {
|
||||
char *filename = git_pathdup("lost-found/%s/%s",
|
||||
obj->type == OBJ_COMMIT ? "commit" : "other",
|
||||
describe_object(obj));
|
||||
describe_object(&obj->oid));
|
||||
FILE *f;
|
||||
|
||||
if (safe_create_leading_directories_const(filename)) {
|
||||
|
|
@ -355,7 +345,7 @@ static void check_unreachable_object(struct object *obj)
|
|||
if (stream_blob_to_fd(fileno(f), &obj->oid, NULL, 1))
|
||||
die_errno(_("could not write '%s'"), filename);
|
||||
} else
|
||||
fprintf(f, "%s\n", describe_object(obj));
|
||||
fprintf(f, "%s\n", describe_object(&obj->oid));
|
||||
if (fclose(f))
|
||||
die_errno(_("could not finish '%s'"),
|
||||
filename);
|
||||
|
|
@ -374,7 +364,7 @@ static void check_unreachable_object(struct object *obj)
|
|||
static void check_object(struct object *obj)
|
||||
{
|
||||
if (verbose)
|
||||
fprintf_ln(stderr, _("Checking %s"), describe_object(obj));
|
||||
fprintf_ln(stderr, _("Checking %s"), describe_object(&obj->oid));
|
||||
|
||||
if (obj->flags & REACHABLE)
|
||||
check_reachable_object(obj);
|
||||
|
|
@ -432,7 +422,8 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
|
|||
|
||||
if (verbose)
|
||||
fprintf_ln(stderr, _("Checking %s %s"),
|
||||
printable_type(obj), describe_object(obj));
|
||||
printable_type(&obj->oid, obj->type),
|
||||
describe_object(&obj->oid));
|
||||
|
||||
if (fsck_walk(obj, NULL, &fsck_obj_options))
|
||||
objerror(obj, _("broken links"));
|
||||
|
|
@ -445,7 +436,7 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
|
|||
|
||||
if (!commit->parents && show_root)
|
||||
printf_ln(_("root %s"),
|
||||
describe_object(&commit->object));
|
||||
describe_object(&commit->object.oid));
|
||||
}
|
||||
|
||||
if (obj->type == OBJ_TAG) {
|
||||
|
|
@ -453,10 +444,10 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
|
|||
|
||||
if (show_tags && tag->tagged) {
|
||||
printf_ln(_("tagged %s %s (%s) in %s"),
|
||||
printable_type(tag->tagged),
|
||||
describe_object(tag->tagged),
|
||||
printable_type(&tag->tagged->oid, tag->tagged->type),
|
||||
describe_object(&tag->tagged->oid),
|
||||
tag->tag,
|
||||
describe_object(&tag->object));
|
||||
describe_object(&tag->object.oid));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -499,10 +490,10 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid,
|
|||
if (!is_null_oid(oid)) {
|
||||
obj = lookup_object(the_repository, oid);
|
||||
if (obj && (obj->flags & HAS_OBJ)) {
|
||||
if (timestamp && name_objects)
|
||||
add_decoration(fsck_walk_options.object_names,
|
||||
obj,
|
||||
xstrfmt("%s@{%"PRItime"}", refname, timestamp));
|
||||
if (timestamp)
|
||||
fsck_put_object_name(&fsck_walk_options, oid,
|
||||
"%s@{%"PRItime"}",
|
||||
refname, timestamp);
|
||||
obj->flags |= USED;
|
||||
mark_object_reachable(obj);
|
||||
} else if (!is_promisor_object(oid)) {
|
||||
|
|
@ -566,9 +557,8 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
|
|||
}
|
||||
default_refs++;
|
||||
obj->flags |= USED;
|
||||
if (name_objects)
|
||||
add_decoration(fsck_walk_options.object_names,
|
||||
obj, xstrdup(refname));
|
||||
fsck_put_object_name(&fsck_walk_options,
|
||||
oid, "%s", refname);
|
||||
mark_object_reachable(obj);
|
||||
|
||||
return 0;
|
||||
|
|
@ -742,9 +732,7 @@ static int fsck_cache_tree(struct cache_tree *it)
|
|||
return 1;
|
||||
}
|
||||
obj->flags |= USED;
|
||||
if (name_objects)
|
||||
add_decoration(fsck_walk_options.object_names,
|
||||
obj, xstrdup(":"));
|
||||
fsck_put_object_name(&fsck_walk_options, &it->oid, ":");
|
||||
mark_object_reachable(obj);
|
||||
if (obj->type != OBJ_TREE)
|
||||
err |= objerror(obj, _("non-tree in cache-tree"));
|
||||
|
|
@ -830,8 +818,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
|||
}
|
||||
|
||||
if (name_objects)
|
||||
fsck_walk_options.object_names =
|
||||
xcalloc(1, sizeof(struct decoration));
|
||||
fsck_enable_object_names(&fsck_walk_options);
|
||||
|
||||
git_config(fsck_config, NULL);
|
||||
|
||||
|
|
@ -890,9 +877,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
|||
}
|
||||
|
||||
obj->flags |= USED;
|
||||
if (name_objects)
|
||||
add_decoration(fsck_walk_options.object_names,
|
||||
obj, xstrdup(arg));
|
||||
fsck_put_object_name(&fsck_walk_options, &oid,
|
||||
"%s", arg);
|
||||
mark_object_reachable(obj);
|
||||
continue;
|
||||
}
|
||||
|
|
@ -928,10 +914,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
|||
continue;
|
||||
obj = &blob->object;
|
||||
obj->flags |= USED;
|
||||
if (name_objects)
|
||||
add_decoration(fsck_walk_options.object_names,
|
||||
obj,
|
||||
xstrfmt(":%s", active_cache[i]->name));
|
||||
fsck_put_object_name(&fsck_walk_options, &obj->oid,
|
||||
":%s", active_cache[i]->name);
|
||||
mark_object_reachable(obj);
|
||||
}
|
||||
if (active_cache_tree)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue