diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:54 -0700 |
| commit | 1c88a6d17492b197b9b3298cbc34efa804928302 (patch) | |
| tree | b0370caa6322930a13898673c5a559aef20c8791 /tree-diff.c | |
| parent | 31190841049549b5daaffeb0b9888ebed0bbfc8a (diff) | |
| parent | e09e4024a070e666ed40b66442e8151b91d623e4 (diff) | |
| download | git-1c88a6d17492b197b9b3298cbc34efa804928302.tar.gz | |
Sync with 1.7.11.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 7e5483366e..ba01563a02 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); |