diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-05 22:25:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-05 22:25:00 -0800 |
| commit | e3c3a550d4815d34b5674776c36cdd6d8a31ab85 (patch) | |
| tree | 4e29155b4383f995503807adf76c62f69347ed00 /diff-tree.c | |
| parent | 2718435b7b746c3c249525b02fbcbad68f5a45f3 (diff) | |
| download | git-e3c3a550d4815d34b5674776c36cdd6d8a31ab85.tar.gz | |
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>
Diffstat (limited to 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/diff-tree.c b/diff-tree.c index 2df23c65fd..e7410b4e0b 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -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; } |