diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 21:53:40 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 21:53:40 +0400 |
| commit | 738c2187604756fea3901554a49f9137e02ed0ef (patch) | |
| tree | ac786621832f1ac568761e96989ca984a836530e /builtin/blame.c | |
| parent | 3f835949e9b800619136f2511e84000c95916d6e (diff) | |
| parent | 28452655af988094792483a51d188c58137760cd (diff) | |
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 'builtin/blame.c')
| -rw-r--r-- | builtin/blame.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index a9705d06a5..cad4111a36 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -407,8 +407,7 @@ static struct origin *find_origin(struct scoreboard *sb, paths[1] = NULL; diff_tree_setup_paths(paths, &diff_opts); - if (diff_setup_done(&diff_opts) < 0) - die("diff-setup"); + diff_setup_done(&diff_opts); if (is_null_sha1(origin->commit->object.sha1)) do_diff_cache(parent->tree->object.sha1, &diff_opts); @@ -494,8 +493,7 @@ static struct origin *find_rename(struct scoreboard *sb, diff_opts.single_follow = origin->path; paths[0] = NULL; diff_tree_setup_paths(paths, &diff_opts); - if (diff_setup_done(&diff_opts) < 0) - die("diff-setup"); + diff_setup_done(&diff_opts); if (is_null_sha1(origin->commit->object.sha1)) do_diff_cache(parent->tree->object.sha1, &diff_opts); @@ -1075,8 +1073,7 @@ static int find_copy_in_parent(struct scoreboard *sb, paths[0] = NULL; diff_tree_setup_paths(paths, &diff_opts); - if (diff_setup_done(&diff_opts) < 0) - die("diff-setup"); + diff_setup_done(&diff_opts); /* Try "find copies harder" on new path if requested; * we do not want to use diffcore_rename() actually to |