summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-22 21:17:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-22 21:29:06 (GMT)
commite7c3a59c22b28002d7cab3a4a0807fdc0d2388c9 (patch)
treee548f0eae1fe9c8eb01684cdb3f2ee6a4b5dcce4 /builtin/diff.c
parentc2e86addb86689306b992065328ec52aa2479658 (diff)
downloadgit-e7c3a59c22b28002d7cab3a4a0807fdc0d2388c9.zip
git-e7c3a59c22b28002d7cab3a4a0807fdc0d2388c9.tar.gz
git-e7c3a59c22b28002d7cab3a4a0807fdc0d2388c9.tar.bz2
builtin/diff.c: remove duplicated call to diff_result_code()
The return value from builtin_diff_files() is fed to diff_result_code() by the caller, and all other callees like builtin_diff_index() do not have their own call to diff_result_code(). Remove the duplicated one from builtin_diff_files() and let the caller handle it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
-rw-r--r--builtin/diff.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index 4c9deb2..171ac39 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -207,7 +207,6 @@ static void refresh_index_quietly(void)
static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv)
{
- int result;
unsigned int options = 0;
while (1 < argc && argv[1][0] == '-') {
@@ -241,8 +240,7 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv
perror("read_cache_preload");
return -1;
}
- result = run_diff_files(revs, options);
- return diff_result_code(&revs->diffopt, result);
+ return run_diff_files(revs, options);
}
int cmd_diff(int argc, const char **argv, const char *prefix)