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

Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

Browse Source 
* tr/void-diff-setup-done:
  diff_setup_done(): return void
This commit is contained in:
Junio C Hamano
2012-09-11 10:53:40 -07:00
parent 3f835949e9 28452655af
commit 738c218760
13 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
submodule.c
View File

@ -574,8 +574,7 @@ static void calculate_changed_submodule_paths(void)
DIFF_OPT_SET(&diff_opts, RECURSIVE);
diff_opts.output_format |= DIFF_FORMAT_CALLBACK;
diff_opts.format_callback = submodule_collect_changed_cb;
if (diff_setup_done(&diff_opts) < 0)
die("diff_setup_done failed");
diff_setup_done(&diff_opts);
diff_tree_sha1(parent->item->object.sha1, commit->object.sha1, "", &diff_opts);
diffcore_std(&diff_opts);
diff_flush(&diff_opts);