mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
combine-diff: remove misguided --show-empty hack.
Now --always flag is available in diff-tree, there is no reason to have that hack in the diffcore side. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
2718435b7b
commit
e3c3a550d4
|
@ -608,7 +608,7 @@ static void reuse_combine_diff(struct sline *sline, unsigned long cnt,
|
|||
}
|
||||
|
||||
int show_combined_diff(struct combine_diff_path *elem, int num_parent,
|
||||
int dense, const char *header, int show_empty)
|
||||
int dense, const char *header)
|
||||
{
|
||||
unsigned long size, cnt, lno;
|
||||
char *result, *cp, *ep;
|
||||
|
@ -742,8 +742,7 @@ int show_combined_diff(struct combine_diff_path *elem, int num_parent,
|
|||
}
|
||||
|
||||
int diff_tree_combined_merge(const unsigned char *sha1,
|
||||
const char *header,
|
||||
int show_empty_merge, int dense)
|
||||
const char *header, int dense)
|
||||
{
|
||||
struct commit *commit = lookup_commit(sha1);
|
||||
struct diff_options diffopts;
|
||||
|
@ -777,12 +776,11 @@ int diff_tree_combined_merge(const unsigned char *sha1,
|
|||
if (p->len)
|
||||
num_paths++;
|
||||
}
|
||||
if (num_paths || show_empty_merge) {
|
||||
if (num_paths) {
|
||||
for (p = paths; p; p = p->next) {
|
||||
if (!p->len)
|
||||
continue;
|
||||
if (show_combined_diff(p, num_parent, dense, header,
|
||||
show_empty_merge))
|
||||
if (show_combined_diff(p, num_parent, dense, header))
|
||||
header = NULL;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -160,7 +160,7 @@ int main(int argc, const char **argv)
|
|||
if (combine_merges && num_compare_stages == 2) {
|
||||
show_combined_diff(&combine.p, 2,
|
||||
dense_combined_merges,
|
||||
NULL, 0);
|
||||
NULL);
|
||||
free(combine.p.path);
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -6,7 +6,6 @@ static int show_root_diff = 0;
|
|||
static int no_commit_id = 0;
|
||||
static int verbose_header = 0;
|
||||
static int ignore_merges = 1;
|
||||
static int show_empty_combined = 0;
|
||||
static int combine_merges = 0;
|
||||
static int dense_combined_merges = 0;
|
||||
static int read_stdin = 0;
|
||||
|
@ -127,7 +126,6 @@ static int diff_tree_commit(const unsigned char *commit_sha1)
|
|||
else if (combine_merges) {
|
||||
header = generate_header(sha1, sha1, commit);
|
||||
return diff_tree_combined_merge(sha1, header,
|
||||
show_empty_combined,
|
||||
dense_combined_merges);
|
||||
}
|
||||
}
|
||||
|
@ -278,7 +276,6 @@ int main(int argc, const char **argv)
|
|||
|
||||
if (combine_merges) {
|
||||
diff_options.output_format = DIFF_FORMAT_PATCH;
|
||||
show_empty_combined = !ignore_merges;
|
||||
ignore_merges = 0;
|
||||
}
|
||||
|
||||
|
|
4
diff.h
4
diff.h
|
@ -68,9 +68,9 @@ struct combine_diff_path {
|
|||
};
|
||||
|
||||
int show_combined_diff(struct combine_diff_path *elem, int num_parent,
|
||||
int dense, const char *header, int show_empty);
|
||||
int dense, const char *header);
|
||||
|
||||
extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
|
||||
extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int);
|
||||
|
||||
extern void diff_addremove(struct diff_options *,
|
||||
int addremove,
|
||||
|
|
Loading…
Reference in a new issue