diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 10:53:40 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 10:53:40 -0700 |
commit | 738c2187604756fea3901554a49f9137e02ed0ef (patch) | |
tree | ac786621832f1ac568761e96989ca984a836530e /tree-diff.c | |
parent | 3f835949e9b800619136f2511e84000c95916d6e (diff) | |
parent | 28452655af988094792483a51d188c58137760cd (diff) | |
download | git-738c2187604756fea3901554a49f9137e02ed0ef.tar.gz git-738c2187604756fea3901554a49f9137e02ed0ef.tar.xz |
Merge branch 'tr/void-diff-setup-done' into maint-1.7.11
* tr/void-diff-setup-done:
diff_setup_done(): return void
Diffstat (limited to 'tree-diff.c')
-rw-r--r-- | tree-diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tree-diff.c b/tree-diff.c index 7e5483366..ba01563a0 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -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; paths[0] = NULL; diff_tree_setup_paths(paths, &diff_opts); - if (diff_setup_done(&diff_opts) < 0) - die("unable to set up diff options to follow renames"); + diff_setup_done(&diff_opts); diff_tree(t1, t2, base, &diff_opts); diffcore_std(&diff_opts); diff_tree_release_paths(&diff_opts); |