This shows "new file mode XXXX" and "deleted file mode XXXX"
lines like two-way diff-patch output does, by checking the
status from each parent.
The diff-raw output for combined diff is made a bit uglier by
showing diff status letters with each parent. While most of the
case you would see "MM" in the output, an Evil Merge that
touches a path that was added by inheriting from one parent is
possible and it would be shown like these:
$ git-diff-tree --abbrev -c HEAD
2d7ca89675eb8888b0b88a91102f096d4471f09f
::000000 000000 100644
0000000...
0000000...
31dd686... AA b
::000000 100644 100644
0000000...
6c884ae...
c6d4fa8... AM d
::100644 100644 100644
4f7cbe7...
f8c295c...
19d5d80... RR e
Signed-off-by: Junio C Hamano <junkio@cox.net>
p->mode = q->queue[i]->two->mode;
memcpy(p->parent[n].sha1, q->queue[i]->one->sha1, 20);
p->parent[n].mode = q->queue[i]->one->mode;
p->mode = q->queue[i]->two->mode;
memcpy(p->parent[n].sha1, q->queue[i]->one->sha1, 20);
p->parent[n].mode = q->queue[i]->one->mode;
+ p->parent[n].status = q->queue[i]->status;
*tail = p;
tail = &p->next;
}
*tail = p;
tail = &p->next;
}
memcpy(p->parent[n].sha1,
q->queue[i]->one->sha1, 20);
p->parent[n].mode = q->queue[i]->one->mode;
memcpy(p->parent[n].sha1,
q->queue[i]->one->sha1, 20);
p->parent[n].mode = q->queue[i]->one->mode;
+ p->parent[n].status = q->queue[i]->status;
printf("..%s\n", abb);
if (mode_differs) {
printf("..%s\n", abb);
if (mode_differs) {
- printf("mode ");
- for (i = 0; i < num_parent; i++) {
- printf("%s%06o", i ? "," : "",
- elem->parent[i].mode);
+ int added = !!elem->mode;
+ for (i = 0; added && i < num_parent; i++)
+ if (elem->parent[i].status !=
+ DIFF_STATUS_ADDED)
+ added = 0;
+ if (added)
+ printf("new file mode %06o", elem->mode);
+ else {
+ if (!elem->mode)
+ printf("deleted file ");
+ printf("mode ");
+ for (i = 0; i < num_parent; i++) {
+ printf("%s%06o", i ? "," : "",
+ elem->parent[i].mode);
+ }
+ if (elem->mode)
+ printf("..%06o", elem->mode);
- printf("..%06o\n", elem->mode);
}
dump_sline(sline, cnt, num_parent);
}
}
dump_sline(sline, cnt, num_parent);
}
}
if (opt->output_format == DIFF_FORMAT_RAW ||
}
if (opt->output_format == DIFF_FORMAT_RAW ||
- opt->output_format == DIFF_FORMAT_NAME_STATUS)
- printf("%c%c", mod_type, inter_name_termination);
+ opt->output_format == DIFF_FORMAT_NAME_STATUS) {
+ for (i = 0; i < num_parent; i++)
+ putchar(p->parent[i].status);
+ putchar(inter_name_termination);
+ }
if (line_termination) {
if (quote_c_style(p->path, NULL, NULL, 0))
if (line_termination) {
if (quote_c_style(p->path, NULL, NULL, 0))
unsigned int mode;
unsigned char sha1[20];
struct combine_diff_parent {
unsigned int mode;
unsigned char sha1[20];
struct combine_diff_parent {
unsigned int mode;
unsigned char sha1[20];
} parent[FLEX_ARRAY];
unsigned int mode;
unsigned char sha1[20];
} parent[FLEX_ARRAY];