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.h
View File

@ -452,11 +452,11 @@ struct combine_diff_path {
st_mult(sizeof(struct combine_diff_parent), (n)))
void show_combined_diff(struct combine_diff_path *elem, int num_parent,
int dense, struct rev_info *);
struct rev_info *);
void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, struct rev_info *rev);
void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev);
void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);