mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tr/void-diff-setup-done'

Browse Source 
Remove unnecessary code.

* tr/void-diff-setup-done:
  diff_setup_done(): return void
This commit is contained in:
Junio C Hamano
2012-08-22 11:52:26 -07:00
parent 8d35c11457 28452655af
commit 9cd33bbc52
13 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
merge-recursive.c
View File

@ -493,8 +493,7 @@ static struct string_list *get_renames(struct merge_options *o,
opts.rename_score = o->rename_score;
opts.show_rename_progress = o->show_rename_progress;
opts.output_format = DIFF_FORMAT_NO_OUTPUT;
if (diff_setup_done(&opts) < 0)
die(_("diff setup failed"));
diff_setup_done(&opts);
diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
diffcore_std(&opts);
if (opts.needed_rename_limit > o->needed_rename_limit)