summaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-22 18:52:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-22 18:52:27 (GMT)
commit9cd33bbc529bfa830c687d377433c46474d10e6a (patch)
tree79268934569751906061421fcd5c46b751441c67 /builtin/blame.c
parent8d35c114579fd870feb61f3746e1371634fd2163 (diff)
parent28452655af988094792483a51d188c58137760cd (diff)
downloadgit-9cd33bbc529bfa830c687d377433c46474d10e6a.zip
git-9cd33bbc529bfa830c687d377433c46474d10e6a.tar.gz
git-9cd33bbc529bfa830c687d377433c46474d10e6a.tar.bz2
Merge branch 'tr/void-diff-setup-done'
Remove unnecessary code. * tr/void-diff-setup-done: diff_setup_done(): return void
Diffstat (limited to 'builtin/blame.c')
-rw-r--r--builtin/blame.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 0d50273..48dbfa4 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -406,8 +406,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);
@@ -493,8 +492,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);
@@ -1074,8 +1072,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