summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-28 21:11:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-28 21:11:43 (GMT)
commit76a89d6d828486f96f42c69ef0cf87bb6b72fef5 (patch)
treee5112817beba1e701d20e88b4d0c5bdf5fe7de0d /builtin/diff.c
parent78c6e0f3fa41d697f2e01850b0a361e21095545d (diff)
parentf31027c99cb2ec4eb7ad8d1ebc7f0e20fef4bd1d (diff)
downloadgit-76a89d6d828486f96f42c69ef0cf87bb6b72fef5.zip
git-76a89d6d828486f96f42c69ef0cf87bb6b72fef5.tar.gz
git-76a89d6d828486f96f42c69ef0cf87bb6b72fef5.tar.bz2
Merge branch 'jc/rename-degrade-cc-to-c'
* 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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index 717fa1a..14bd14f 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)