Skip to content

Commit

Permalink
Merge branch 'tr/void-diff-setup-done' into maint-1.7.11
Browse files Browse the repository at this point in the history 
* tr/void-diff-setup-done:
  diff_setup_done(): return void
  • Loading branch information
@gitster
gitster committed Sep 11, 2012
2 parents 3f83594 + 2845265 commit 738c218
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 32 deletions.
9 changes: 3 additions & 6 deletions builtin/blame.c
View file
Expand Up @@ -407,8 +407,7 @@ static struct origin *find_origin(struct scoreboard *sb,
paths[1] = NULL; paths[1] = NULL;


diff_tree_setup_paths(paths, &diff_opts); diff_tree_setup_paths(paths, &diff_opts);
if (diff_setup_done(&diff_opts) < 0) diff_setup_done(&diff_opts);
die("diff-setup");


if (is_null_sha1(origin->commit->object.sha1)) if (is_null_sha1(origin->commit->object.sha1))
do_diff_cache(parent->tree->object.sha1, &diff_opts); do_diff_cache(parent->tree->object.sha1, &diff_opts);
Expand Down Expand Up @@ -494,8 +493,7 @@ static struct origin *find_rename(struct scoreboard *sb,
diff_opts.single_follow = origin->path; diff_opts.single_follow = origin->path;
paths[0] = NULL; paths[0] = NULL;
diff_tree_setup_paths(paths, &diff_opts); diff_tree_setup_paths(paths, &diff_opts);
if (diff_setup_done(&diff_opts) < 0) diff_setup_done(&diff_opts);
die("diff-setup");


if (is_null_sha1(origin->commit->object.sha1)) if (is_null_sha1(origin->commit->object.sha1))
do_diff_cache(parent->tree->object.sha1, &diff_opts); do_diff_cache(parent->tree->object.sha1, &diff_opts);
Expand Down Expand Up @@ -1075,8 +1073,7 @@ static int find_copy_in_parent(struct scoreboard *sb,


paths[0] = NULL; paths[0] = NULL;
diff_tree_setup_paths(paths, &diff_opts); diff_tree_setup_paths(paths, &diff_opts);
if (diff_setup_done(&diff_opts) < 0) diff_setup_done(&diff_opts);
die("diff-setup");


/* Try "find copies harder" on new path if requested; /* Try "find copies harder" on new path if requested;
* we do not want to use diffcore_rename() actually to * we do not want to use diffcore_rename() actually to
Expand Down
3 changes: 1 addition & 2 deletions builtin/checkout.c
View file
Expand Up @@ -315,8 +315,7 @@ static void show_local_changes(struct object *head, struct diff_options *opts)
init_revisions(&rev, NULL); init_revisions(&rev, NULL);
rev.diffopt.flags = opts->flags; rev.diffopt.flags = opts->flags;
rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
if (diff_setup_done(&rev.diffopt) < 0) diff_setup_done(&rev.diffopt);
die(_("diff_setup_done failed"));
add_pending_object(&rev, head, NULL); add_pending_object(&rev, head, NULL);
run_diff_index(&rev, 0); run_diff_index(&rev, 0);
} }
Expand Down
3 changes: 1 addition & 2 deletions builtin/diff.c
View file
Expand Up @@ -302,8 +302,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
argc = setup_revisions(argc, argv, &rev, NULL); argc = setup_revisions(argc, argv, &rev, NULL);
if (!rev.diffopt.output_format) { if (!rev.diffopt.output_format) {
rev.diffopt.output_format = DIFF_FORMAT_PATCH; rev.diffopt.output_format = DIFF_FORMAT_PATCH;
if (diff_setup_done(&rev.diffopt) < 0) diff_setup_done(&rev.diffopt);
die(_("diff_setup_done failed"));
} }


DIFF_OPT_SET(&rev.diffopt, RECURSIVE); DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
Expand Down
3 changes: 1 addition & 2 deletions builtin/merge.c
View file
Expand Up @@ -404,8 +404,7 @@ static void finish(struct commit *head_commit,
opts.output_format |= opts.output_format |=
DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
opts.detect_rename = DIFF_DETECT_RENAME; opts.detect_rename = DIFF_DETECT_RENAME;
if (diff_setup_done(&opts) < 0) diff_setup_done(&opts);
die(_("diff_setup_done failed"));
diff_tree_sha1(head, new_head, "", &opts); diff_tree_sha1(head, new_head, "", &opts);
diffcore_std(&opts); diffcore_std(&opts);
diff_flush(&opts); diff_flush(&opts);
Expand Down
3 changes: 1 addition & 2 deletions diff-no-index.c
View file
Expand Up @@ -258,8 +258,7 @@ void diff_no_index(struct rev_info *revs,
DIFF_OPT_SET(&revs->diffopt, NO_INDEX); DIFF_OPT_SET(&revs->diffopt, NO_INDEX);


revs->max_count = -2; revs->max_count = -2;
if (diff_setup_done(&revs->diffopt) < 0) diff_setup_done(&revs->diffopt);
die("diff_setup_done failed");


setup_diff_pager(&revs->diffopt); setup_diff_pager(&revs->diffopt);
DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS); DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
Expand Down
4 changes: 1 addition & 3 deletions diff.c
View file
Expand Up @@ -3187,7 +3187,7 @@ void diff_setup(struct diff_options *options)
} }
} }


int diff_setup_done(struct diff_options *options) void diff_setup_done(struct diff_options *options)
{ {
int count = 0; int count = 0;


Expand Down Expand Up @@ -3286,8 +3286,6 @@ int diff_setup_done(struct diff_options *options)
options->output_format = DIFF_FORMAT_NO_OUTPUT; options->output_format = DIFF_FORMAT_NO_OUTPUT;
DIFF_OPT_SET(options, EXIT_WITH_STATUS); DIFF_OPT_SET(options, EXIT_WITH_STATUS);
} }

return 0;
} }


static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val) static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
Expand Down
2 changes: 1 addition & 1 deletion diff.h
View file
Expand Up @@ -246,7 +246,7 @@ extern int git_diff_ui_config(const char *var, const char *value, void *cb);
extern int diff_use_color_default; extern int diff_use_color_default;
extern void diff_setup(struct diff_options *); extern void diff_setup(struct diff_options *);
extern int diff_opt_parse(struct diff_options *, const char **, int); extern int diff_opt_parse(struct diff_options *, const char **, int);
extern int diff_setup_done(struct diff_options *); extern void diff_setup_done(struct diff_options *);


#define DIFF_DETECT_RENAME 1 #define DIFF_DETECT_RENAME 1
#define DIFF_DETECT_COPY 2 #define DIFF_DETECT_COPY 2
Expand Down
3 changes: 1 addition & 2 deletions merge-recursive.c
View file
Expand Up @@ -493,8 +493,7 @@ static struct string_list *get_renames(struct merge_options *o,
opts.rename_score = o->rename_score; opts.rename_score = o->rename_score;
opts.show_rename_progress = o->show_rename_progress; opts.show_rename_progress = o->show_rename_progress;
opts.output_format = DIFF_FORMAT_NO_OUTPUT; opts.output_format = DIFF_FORMAT_NO_OUTPUT;
if (diff_setup_done(&opts) < 0) diff_setup_done(&opts);
die("diff setup failed");
diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts); diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
diffcore_std(&opts); diffcore_std(&opts);
if (opts.needed_rename_limit > o->needed_rename_limit) if (opts.needed_rename_limit > o->needed_rename_limit)
Expand Down
6 changes: 2 additions & 4 deletions notes-merge.c
View file
Expand Up @@ -126,8 +126,7 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
diff_setup(&opt); diff_setup(&opt);
DIFF_OPT_SET(&opt, RECURSIVE); DIFF_OPT_SET(&opt, RECURSIVE);
opt.output_format = DIFF_FORMAT_NO_OUTPUT; opt.output_format = DIFF_FORMAT_NO_OUTPUT;
if (diff_setup_done(&opt) < 0) diff_setup_done(&opt);
die("diff_setup_done failed");
diff_tree_sha1(base, remote, "", &opt); diff_tree_sha1(base, remote, "", &opt);
diffcore_std(&opt); diffcore_std(&opt);


Expand Down Expand Up @@ -190,8 +189,7 @@ static void diff_tree_local(struct notes_merge_options *o,
diff_setup(&opt); diff_setup(&opt);
DIFF_OPT_SET(&opt, RECURSIVE); DIFF_OPT_SET(&opt, RECURSIVE);
opt.output_format = DIFF_FORMAT_NO_OUTPUT; opt.output_format = DIFF_FORMAT_NO_OUTPUT;
if (diff_setup_done(&opt) < 0) diff_setup_done(&opt);
die("diff_setup_done failed");
diff_tree_sha1(base, local, "", &opt); diff_tree_sha1(base, local, "", &opt);
diffcore_std(&opt); diffcore_std(&opt);


Expand Down
3 changes: 1 addition & 2 deletions patch-ids.c
View file
Expand Up @@ -39,8 +39,7 @@ int init_patch_ids(struct patch_ids *ids)
memset(ids, 0, sizeof(*ids)); memset(ids, 0, sizeof(*ids));
diff_setup(&ids->diffopts); diff_setup(&ids->diffopts);
DIFF_OPT_SET(&ids->diffopts, RECURSIVE); DIFF_OPT_SET(&ids->diffopts, RECURSIVE);
if (diff_setup_done(&ids->diffopts) < 0) diff_setup_done(&ids->diffopts);
return error("diff_setup_done failed");
return 0; return 0;
} }


Expand Down
3 changes: 1 addition & 2 deletions revision.c
View file
Expand Up @@ -1855,8 +1855,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
if (revs->combine_merges) if (revs->combine_merges)
revs->ignore_merges = 0; revs->ignore_merges = 0;
revs->diffopt.abbrev = revs->abbrev; revs->diffopt.abbrev = revs->abbrev;
if (diff_setup_done(&revs->diffopt) < 0) diff_setup_done(&revs->diffopt);
die("diff_setup_done failed");


compile_grep_patterns(&revs->grep_filter); compile_grep_patterns(&revs->grep_filter);


Expand Down
3 changes: 1 addition & 2 deletions submodule.c
View file
Expand Up @@ -574,8 +574,7 @@ static void calculate_changed_submodule_paths(void)
DIFF_OPT_SET(&diff_opts, RECURSIVE); DIFF_OPT_SET(&diff_opts, RECURSIVE);
diff_opts.output_format |= DIFF_FORMAT_CALLBACK; diff_opts.output_format |= DIFF_FORMAT_CALLBACK;
diff_opts.format_callback = submodule_collect_changed_cb; diff_opts.format_callback = submodule_collect_changed_cb;
if (diff_setup_done(&diff_opts) < 0) diff_setup_done(&diff_opts);
die("diff_setup_done failed");
diff_tree_sha1(parent->item->object.sha1, commit->object.sha1, "", &diff_opts); diff_tree_sha1(parent->item->object.sha1, commit->object.sha1, "", &diff_opts);
diffcore_std(&diff_opts); diffcore_std(&diff_opts);
diff_flush(&diff_opts); diff_flush(&diff_opts);
Expand Down
3 changes: 1 addition & 2 deletions tree-diff.c
View file
Expand Up @@ -212,8 +212,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
diff_opts.rename_score = opt->rename_score; diff_opts.rename_score = opt->rename_score;
paths[0] = NULL; paths[0] = NULL;
diff_tree_setup_paths(paths, &diff_opts); diff_tree_setup_paths(paths, &diff_opts);
if (diff_setup_done(&diff_opts) < 0) diff_setup_done(&diff_opts);
die("unable to set up diff options to follow renames");
diff_tree(t1, t2, base, &diff_opts); diff_tree(t1, t2, base, &diff_opts);
diffcore_std(&diff_opts); diffcore_std(&diff_opts);
diff_tree_release_paths(&diff_opts); diff_tree_release_paths(&diff_opts);
Expand Down

0 comments on commit 738c218

Please sign in to comment.