39
p->mode = q->queue[i]->two->mode;
40
memcpy(p->parent[n].sha1, q->queue[i]->one->sha1, 20);
41
p->parent[n].mode = q->queue[i]->one->mode;
42
+ p->parent[n].status = q->queue[i]->status;
43
*tail = p;
44
tail = &p->next;
45
}
63
memcpy(p->parent[n].sha1,
64
q->queue[i]->one->sha1, 20);
65
p->parent[n].mode = q->queue[i]->one->mode;
66
+ p->parent[n].status = q->queue[i]->status;
67
break;
68
}
69
}
741
printf("..%s\n", abb);
742
743
if (mode_differs) {
742
- printf("mode ");
743
- for (i = 0; i < num_parent; i++) {
744
- printf("%s%06o", i ? "," : "",
745
- elem->parent[i].mode);
744
+ int added = !!elem->mode;
745
+ for (i = 0; added && i < num_parent; i++)
746
+ if (elem->parent[i].status !=
747
+ DIFF_STATUS_ADDED)
748
+ added = 0;
749
+ if (added)
750
+ printf("new file mode %06o", elem->mode);
751
+ else {
752
+ if (!elem->mode)
753
+ printf("deleted file ");
754
+ printf("mode ");
755
+ for (i = 0; i < num_parent; i++) {
756
+ printf("%s%06o", i ? "," : "",
757
+ elem->parent[i].mode);
758
+ }
759
+ if (elem->mode)
760
+ printf("..%06o", elem->mode);
761
}
747
- printf("..%06o\n", elem->mode);
762
+ putchar('\n');
763
}
764
dump_sline(sline, cnt, num_parent);
765
}
826
}
827
828
if (opt->output_format == DIFF_FORMAT_RAW ||
814
- opt->output_format == DIFF_FORMAT_NAME_STATUS)
815
- printf("%c%c", mod_type, inter_name_termination);
829
+ opt->output_format == DIFF_FORMAT_NAME_STATUS) {
830
+ for (i = 0; i < num_parent; i++)
831
+ putchar(p->parent[i].status);
832
+ putchar(inter_name_termination);
833
+ }
834
835
if (line_termination) {
836
if (quote_c_style(p->path, NULL, NULL, 0))