summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c2e86ad)
raw | patch | inline | side by side (parent: c2e86ad)
author | Junio C Hamano <gitster@pobox.com> | |
Tue, 22 Mar 2011 21:17:30 +0000 (14:17 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 22 Mar 2011 21:29:06 +0000 (14:29 -0700) |
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>
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>
builtin/diff.c | patch | blob | history |
diff --git a/builtin/diff.c b/builtin/diff.c
index 4c9deb28ec15d0c2adae795cc2c177b24256e585..171ac39274ed8f2e7d5a03de2f88a280b9276b2f 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
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)