@matheusbsbs / matheus-bagliano / commits / e7c3a59c22
Fork 0

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>

Junio C Hamano committed Mar 22, 2011 at 14:17 UTC e7c3a59c22b28002d7cab3a4a0807fdc0d2388c9
1 file changed +1 -3
builtin/diff.c
+1 -3
@@ -207,7 +207,6 @@ static void refresh_index_quietly(void)
207
208 static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv)
209 {
210 - int result;
210 unsigned int options = 0;
211
212 while (1 < argc && argv[1][0] == '-') {
@@ -241,8 +240,7 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv
240 perror("read_cache_preload");
241 return -1;
242 }
244 - result = run_diff_files(revs, options);
245 - return diff_result_code(&revs->diffopt, result);
243 + return run_diff_files(revs, options);
244 }
245
246 int cmd_diff(int argc, const char **argv, const char *prefix)