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

Merge branch 'so/combine-diff-simplify'

Browse Source 
Code simplification.

* so/combine-diff-simplify:
  diff: get rid of redundant 'dense' argument
This commit is contained in:
Junio C Hamano
2020-10-05 14:01:51 -07:00
parent 58138d3f26 d01141de5a
commit 34415c76c8
6 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
diff-lib.c
View File

@ -177,9 +177,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
i--;
if (revs->combine_merges && num_compare_stages == 2) {
show_combined_diff(dpath, 2,
revs->dense_combined_merges,
revs);
show_combined_diff(dpath, 2, revs);
free(dpath);
continue;
}
@ -361,7 +359,7 @@ static int show_modified(struct rev_info *revs,
p->parent[1].status = DIFF_STATUS_MODIFIED;
p->parent[1].mode = old_entry->ce_mode;
oidcpy(&p->parent[1].oid, &old_entry->oid);
show_combined_diff(p, 2, revs->dense_combined_merges, revs);
show_combined_diff(p, 2, revs);
free(p);
return 0;
}