diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-22 20:52:26 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-22 20:52:27 +0200 |
| commit | 9cd33bbc529bfa830c687d377433c46474d10e6a (patch) | |
| tree | 79268934569751906061421fcd5c46b751441c67 /submodule.c | |
| parent | Merge branch 'tr/merge-recursive-flush' (diff) | |
| parent | diff_setup_done(): return void (diff) | |
| download | git-9cd33bbc529bfa830c687d377433c46474d10e6a.tar.xz git-9cd33bbc529bfa830c687d377433c46474d10e6a.zip | |
Merge branch 'tr/void-diff-setup-done'
Remove unnecessary code.
* tr/void-diff-setup-done:
diff_setup_done(): return void
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c index 959d349ea7..19dc6a6c0d 100644 --- a/submodule.c +++ b/submodule.c @@ -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); |