From: Junio C Hamano Date: Tue, 22 Mar 2011 21:17:30 +0000 (-0700) Subject: builtin/diff.c: remove duplicated call to diff_result_code() X-Git-Tag: v1.7.5.4~12^2~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e7c3a59c22b28002d7cab3a4a0807fdc0d2388c9;p=git.git 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 --- diff --git a/builtin/diff.c b/builtin/diff.c index 4c9deb28e..171ac3927 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)