mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
rev-list: fix --verify-objects --quiet becoming --objects
When --quiet is specified, finish_object() is called instead of show_object(). The latter is in charge of --verify-objects and will be skipped if --quiet is specified. Move the code up to finish_object(). Also pass the quiet flag along and make it always call show_* functions to avoid similar problems in future. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8ba8fe049f
commit
989937221a
4
bisect.h
4
bisect.h
|
@ -15,12 +15,12 @@ extern void print_commit_list(struct commit_list *list,
|
|||
const char *format_cur,
|
||||
const char *format_last);
|
||||
|
||||
/* bisect_show_flags flags in struct rev_list_info */
|
||||
#define BISECT_SHOW_ALL (1<<0)
|
||||
#define REV_LIST_QUIET (1<<1)
|
||||
|
||||
struct rev_list_info {
|
||||
struct rev_info *revs;
|
||||
int bisect_show_flags;
|
||||
int flags;
|
||||
int show_timestamp;
|
||||
int hdr_termination;
|
||||
const char *header_prefix;
|
||||
|
|
|
@ -52,6 +52,11 @@ static void show_commit(struct commit *commit, void *data)
|
|||
struct rev_list_info *info = data;
|
||||
struct rev_info *revs = info->revs;
|
||||
|
||||
if (info->flags & REV_LIST_QUIET) {
|
||||
finish_commit(commit, data);
|
||||
return;
|
||||
}
|
||||
|
||||
graph_show_commit(revs->graph);
|
||||
|
||||
if (revs->count) {
|
||||
|
@ -172,8 +177,11 @@ static void finish_object(struct object *obj,
|
|||
const struct name_path *path, const char *name,
|
||||
void *cb_data)
|
||||
{
|
||||
struct rev_list_info *info = cb_data;
|
||||
if (obj->type == OBJ_BLOB && !has_sha1_file(obj->sha1))
|
||||
die("missing blob object '%s'", sha1_to_hex(obj->sha1));
|
||||
if (info->revs->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT)
|
||||
parse_object(obj->sha1);
|
||||
}
|
||||
|
||||
static void show_object(struct object *obj,
|
||||
|
@ -181,10 +189,9 @@ static void show_object(struct object *obj,
|
|||
void *cb_data)
|
||||
{
|
||||
struct rev_list_info *info = cb_data;
|
||||
|
||||
finish_object(obj, path, component, cb_data);
|
||||
if (info->revs->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT)
|
||||
parse_object(obj->sha1);
|
||||
if (info->flags & REV_LIST_QUIET)
|
||||
return;
|
||||
show_object_with_name(stdout, obj, path, component);
|
||||
}
|
||||
|
||||
|
@ -254,7 +261,7 @@ static void print_var_int(const char *var, int val)
|
|||
|
||||
static int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
|
||||
{
|
||||
int cnt, flags = info->bisect_show_flags;
|
||||
int cnt, flags = info->flags;
|
||||
char hex[41] = "";
|
||||
struct commit_list *tried;
|
||||
struct rev_info *revs = info->revs;
|
||||
|
@ -305,7 +312,6 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
|
|||
int bisect_list = 0;
|
||||
int bisect_show_vars = 0;
|
||||
int bisect_find_all = 0;
|
||||
int quiet = 0;
|
||||
|
||||
git_config(git_default_config, NULL);
|
||||
init_revisions(&revs, prefix);
|
||||
|
@ -318,7 +324,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
|
|||
if (revs.bisect)
|
||||
bisect_list = 1;
|
||||
|
||||
quiet = DIFF_OPT_TST(&revs.diffopt, QUICK);
|
||||
if (DIFF_OPT_TST(&revs.diffopt, QUICK))
|
||||
info.flags |= REV_LIST_QUIET;
|
||||
for (i = 1 ; i < argc; i++) {
|
||||
const char *arg = argv[i];
|
||||
|
||||
|
@ -337,7 +344,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
|
|||
if (!strcmp(arg, "--bisect-all")) {
|
||||
bisect_list = 1;
|
||||
bisect_find_all = 1;
|
||||
info.bisect_show_flags = BISECT_SHOW_ALL;
|
||||
info.flags |= BISECT_SHOW_ALL;
|
||||
revs.show_decorations = 1;
|
||||
continue;
|
||||
}
|
||||
|
@ -388,10 +395,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
|
|||
return show_bisect_vars(&info, reaches, all);
|
||||
}
|
||||
|
||||
traverse_commit_list(&revs,
|
||||
quiet ? finish_commit : show_commit,
|
||||
quiet ? finish_object : show_object,
|
||||
&info);
|
||||
traverse_commit_list(&revs, show_commit, show_object, &info);
|
||||
|
||||
if (revs.count) {
|
||||
if (revs.left_right && revs.cherry_mark)
|
||||
|
|
Loading…
Reference in a new issue