mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/rename-degrade-cc-to-c'

Browse Source 
* 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()
This commit is contained in:
Junio C Hamano
2011-04-28 14:11:43 -07:00
parent 78c6e0f3fa f31027c99c
commit 76a89d6d82
8 changed files with 152 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/diff.c
View File

@ -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)