diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:00:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:00:02 -0700 |
| commit | b3c89315a33fbded4a8c5d533ca8ddc6087e4c23 (patch) | |
| tree | 804bd0c440bcbd6c365460e5d60163b44cd8c200 /builtin/diff.c | |
| parent | e596fd295fbb6e7453cd541554ba27ab185f870d (diff) | |
| parent | f31027c99cb2ec4eb7ad8d1ebc7f0e20fef4bd1d (diff) | |
| download | git-b3c89315a33fbded4a8c5d533ca8ddc6087e4c23.tar.gz | |
Merge branch 'jc/rename-degrade-cc-to-c' into maint
* jc/rename-degrade-cc-to-c:
diffcore-rename: fall back to -C when -C -C busts the rename limit
diffcore-rename: record filepair for rename src
diffcore-rename: refactor "too many candidates" logic
builtin/diff.c: remove duplicated call to diff_result_code()
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 717fa1a341..14bd14fce0 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -202,7 +202,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] == '-') { @@ -236,8 +235,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) |