diff --git a/diff-files.c b/diff-files.c
index 4ba59f1a25e01ef25392b3a77daa9a7a6d59287f..0c3f80046b51abd3c44da61a71dce7da3a712518 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
}
argv++; argc--;
}
}
argv++; argc--;
}
- if (combine_merges) {
+ if (dense_combined_merges)
diff_options.output_format = DIFF_FORMAT_PATCH;
diff_options.output_format = DIFF_FORMAT_PATCH;
- }
/* Find the directory, and set up the pathspec */
pathspec = get_pathspec(prefix, argv + 1);
/* Find the directory, and set up the pathspec */
pathspec = get_pathspec(prefix, argv + 1);
if (ce_stage(ce)) {
struct {
struct combine_diff_path p;
if (ce_stage(ce)) {
struct {
struct combine_diff_path p;
- unsigned char fill[4][20];
+ struct combine_diff_parent filler[5];
} combine;
int num_compare_stages = 0;
} combine;
int num_compare_stages = 0;
combine.p.path = xmalloc(combine.p.len + 1);
memcpy(combine.p.path, ce->name, combine.p.len);
combine.p.path[combine.p.len] = 0;
combine.p.path = xmalloc(combine.p.len + 1);
memcpy(combine.p.path, ce->name, combine.p.len);
combine.p.path[combine.p.len] = 0;
- memset(combine.p.sha1, 0, 100);
+ combine.p.mode = 0;
+ memset(combine.p.sha1, 0, 20);
+ memset(&combine.p.parent[0], 0,
+ sizeof(combine.filler));
while (i < entries) {
struct cache_entry *nce = active_cache[i];
while (i < entries) {
struct cache_entry *nce = active_cache[i];
*/
stage = ce_stage(nce);
if (2 <= stage) {
*/
stage = ce_stage(nce);
if (2 <= stage) {
+ int mode = ntohl(nce->ce_mode);
num_compare_stages++;
num_compare_stages++;
- memcpy(combine.p.parent_sha1[stage-2],
+ memcpy(combine.p.parent[stage-2].sha1,
nce->sha1, 20);
nce->sha1, 20);
+ combine.p.parent[stage-2].mode =
+ DIFF_FILE_CANON_MODE(mode);
+ combine.p.parent[stage-2].status =
+ DIFF_STATUS_MODIFIED;
}
/* diff against the proper unmerged stage */
}
/* diff against the proper unmerged stage */
if (combine_merges && num_compare_stages == 2) {
show_combined_diff(&combine.p, 2,
dense_combined_merges,
if (combine_merges && num_compare_stages == 2) {
show_combined_diff(&combine.p, 2,
dense_combined_merges,
- NULL);
+ NULL,
+ &diff_options);
free(combine.p.path);
continue;
}
free(combine.p.path);
continue;
}