2 * Copyright (C) 2005 Junio C Hamano
9 #include "xdiff-interface.h"
12 #include "run-command.h"
15 #ifdef NO_FAST_WORKING_DIRECTORY
16 #define FAST_WORKING_DIRECTORY 0
18 #define FAST_WORKING_DIRECTORY 1
21 static int diff_detect_rename_default;
22 static int diff_rename_limit_default = 200;
23 int diff_use_color_default = -1;
24 static const char *external_diff_cmd_cfg;
25 int diff_auto_refresh_index = 1;
27 static char diff_colors[][COLOR_MAXLEN] = {
29 "", /* PLAIN (normal) */
30 "\033[1m", /* METAINFO (bold) */
31 "\033[36m", /* FRAGINFO (cyan) */
32 "\033[31m", /* OLD (red) */
33 "\033[32m", /* NEW (green) */
34 "\033[33m", /* COMMIT (yellow) */
35 "\033[41m", /* WHITESPACE (red background) */
38 static int parse_diff_color_slot(const char *var, int ofs)
40 if (!strcasecmp(var+ofs, "plain"))
42 if (!strcasecmp(var+ofs, "meta"))
44 if (!strcasecmp(var+ofs, "frag"))
46 if (!strcasecmp(var+ofs, "old"))
48 if (!strcasecmp(var+ofs, "new"))
50 if (!strcasecmp(var+ofs, "commit"))
52 if (!strcasecmp(var+ofs, "whitespace"))
53 return DIFF_WHITESPACE;
54 die("bad config variable '%s'", var);
57 static struct ll_diff_driver {
59 struct ll_diff_driver *next;
61 } *user_diff, **user_diff_tail;
64 * Currently there is only "diff.<drivername>.command" variable;
65 * because there are "diff.color.<slot>" variables, we are parsing
66 * this in a bit convoluted way to allow low level diff driver
69 static int parse_lldiff_command(const char *var, const char *ep, const char *value)
73 struct ll_diff_driver *drv;
77 for (drv = user_diff; drv; drv = drv->next)
78 if (!strncmp(drv->name, name, namelen) && !drv->name[namelen])
81 drv = xcalloc(1, sizeof(struct ll_diff_driver));
82 drv->name = xmemdupz(name, namelen);
84 user_diff_tail = &user_diff;
85 *user_diff_tail = drv;
86 user_diff_tail = &(drv->next);
89 return git_config_string(&(drv->cmd), var, value);
93 * 'diff.<what>.funcname' attribute can be specified in the configuration
94 * to define a customized regexp to find the beginning of a function to
95 * be used for hunk header lines of "diff -p" style output.
97 struct funcname_pattern_entry {
102 static struct funcname_pattern_list {
103 struct funcname_pattern_list *next;
104 struct funcname_pattern_entry e;
105 } *funcname_pattern_list;
107 static int parse_funcname_pattern(const char *var, const char *ep, const char *value, int cflags)
111 struct funcname_pattern_list *pp;
113 name = var + 5; /* "diff." */
116 for (pp = funcname_pattern_list; pp; pp = pp->next)
117 if (!strncmp(pp->e.name, name, namelen) && !pp->e.name[namelen])
120 pp = xcalloc(1, sizeof(*pp));
121 pp->e.name = xmemdupz(name, namelen);
122 pp->next = funcname_pattern_list;
123 funcname_pattern_list = pp;
126 pp->e.pattern = xstrdup(value);
127 pp->e.cflags = cflags;
132 * These are to give UI layer defaults.
133 * The core-level commands such as git-diff-files should
134 * never be affected by the setting of diff.renames
135 * the user happens to have in the configuration file.
137 int git_diff_ui_config(const char *var, const char *value, void *cb)
139 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
140 diff_use_color_default = git_config_colorbool(var, value, -1);
143 if (!strcmp(var, "diff.renames")) {
145 diff_detect_rename_default = DIFF_DETECT_RENAME;
146 else if (!strcasecmp(value, "copies") ||
147 !strcasecmp(value, "copy"))
148 diff_detect_rename_default = DIFF_DETECT_COPY;
149 else if (git_config_bool(var,value))
150 diff_detect_rename_default = DIFF_DETECT_RENAME;
153 if (!strcmp(var, "diff.autorefreshindex")) {
154 diff_auto_refresh_index = git_config_bool(var, value);
157 if (!strcmp(var, "diff.external"))
158 return git_config_string(&external_diff_cmd_cfg, var, value);
159 if (!prefixcmp(var, "diff.")) {
160 const char *ep = strrchr(var, '.');
162 if (ep != var + 4 && !strcmp(ep, ".command"))
163 return parse_lldiff_command(var, ep, value);
166 return git_diff_basic_config(var, value, cb);
169 int git_diff_basic_config(const char *var, const char *value, void *cb)
171 if (!strcmp(var, "diff.renamelimit")) {
172 diff_rename_limit_default = git_config_int(var, value);
176 if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
177 int slot = parse_diff_color_slot(var, 11);
179 return config_error_nonbool(var);
180 color_parse(value, var, diff_colors[slot]);
184 if (!prefixcmp(var, "diff.")) {
185 const char *ep = strrchr(var, '.');
187 if (!strcmp(ep, ".funcname")) {
189 return config_error_nonbool(var);
190 return parse_funcname_pattern(var, ep, value,
192 } else if (!strcmp(ep, ".xfuncname")) {
194 return config_error_nonbool(var);
195 return parse_funcname_pattern(var, ep, value,
201 return git_color_default_config(var, value, cb);
204 static char *quote_two(const char *one, const char *two)
206 int need_one = quote_c_style(one, NULL, NULL, 1);
207 int need_two = quote_c_style(two, NULL, NULL, 1);
210 strbuf_init(&res, 0);
211 if (need_one + need_two) {
212 strbuf_addch(&res, '"');
213 quote_c_style(one, &res, NULL, 1);
214 quote_c_style(two, &res, NULL, 1);
215 strbuf_addch(&res, '"');
217 strbuf_addstr(&res, one);
218 strbuf_addstr(&res, two);
220 return strbuf_detach(&res, NULL);
223 static const char *external_diff(void)
225 static const char *external_diff_cmd = NULL;
226 static int done_preparing = 0;
229 return external_diff_cmd;
230 external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
231 if (!external_diff_cmd)
232 external_diff_cmd = external_diff_cmd_cfg;
234 return external_diff_cmd;
237 static struct diff_tempfile {
238 const char *name; /* filename external diff should read from */
241 char tmp_path[PATH_MAX];
244 static int count_lines(const char *data, int size)
246 int count, ch, completely_empty = 1, nl_just_seen = 0;
253 completely_empty = 0;
257 completely_empty = 0;
260 if (completely_empty)
263 count++; /* no trailing newline */
267 static void print_line_count(FILE *file, int count)
271 fprintf(file, "0,0");
277 fprintf(file, "1,%d", count);
282 static void copy_file_with_prefix(FILE *file,
283 int prefix, const char *data, int size,
284 const char *set, const char *reset)
286 int ch, nl_just_seen = 1;
301 fprintf(file, "%s\n\\ No newline at end of file\n", reset);
304 static void emit_rewrite_diff(const char *name_a,
306 struct diff_filespec *one,
307 struct diff_filespec *two,
308 struct diff_options *o)
311 int color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
312 const char *name_a_tab, *name_b_tab;
313 const char *metainfo = diff_get_color(color_diff, DIFF_METAINFO);
314 const char *fraginfo = diff_get_color(color_diff, DIFF_FRAGINFO);
315 const char *old = diff_get_color(color_diff, DIFF_FILE_OLD);
316 const char *new = diff_get_color(color_diff, DIFF_FILE_NEW);
317 const char *reset = diff_get_color(color_diff, DIFF_RESET);
318 static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
320 name_a += (*name_a == '/');
321 name_b += (*name_b == '/');
322 name_a_tab = strchr(name_a, ' ') ? "\t" : "";
323 name_b_tab = strchr(name_b, ' ') ? "\t" : "";
325 strbuf_reset(&a_name);
326 strbuf_reset(&b_name);
327 quote_two_c_style(&a_name, o->a_prefix, name_a, 0);
328 quote_two_c_style(&b_name, o->b_prefix, name_b, 0);
330 diff_populate_filespec(one, 0);
331 diff_populate_filespec(two, 0);
332 lc_a = count_lines(one->data, one->size);
333 lc_b = count_lines(two->data, two->size);
335 "%s--- %s%s%s\n%s+++ %s%s%s\n%s@@ -",
336 metainfo, a_name.buf, name_a_tab, reset,
337 metainfo, b_name.buf, name_b_tab, reset, fraginfo);
338 print_line_count(o->file, lc_a);
339 fprintf(o->file, " +");
340 print_line_count(o->file, lc_b);
341 fprintf(o->file, " @@%s\n", reset);
343 copy_file_with_prefix(o->file, '-', one->data, one->size, old, reset);
345 copy_file_with_prefix(o->file, '+', two->data, two->size, new, reset);
348 static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)
350 if (!DIFF_FILE_VALID(one)) {
351 mf->ptr = (char *)""; /* does not matter */
355 else if (diff_populate_filespec(one, 0))
358 mf->size = one->size;
362 struct diff_words_buffer {
365 long current; /* output pointer */
366 int suppressed_newline;
369 static void diff_words_append(char *line, unsigned long len,
370 struct diff_words_buffer *buffer)
372 if (buffer->text.size + len > buffer->alloc) {
373 buffer->alloc = (buffer->text.size + len) * 3 / 2;
374 buffer->text.ptr = xrealloc(buffer->text.ptr, buffer->alloc);
378 memcpy(buffer->text.ptr + buffer->text.size, line, len);
379 buffer->text.size += len;
382 struct diff_words_data {
383 struct xdiff_emit_state xm;
384 struct diff_words_buffer minus, plus;
388 static void print_word(FILE *file, struct diff_words_buffer *buffer, int len, int color,
389 int suppress_newline)
397 ptr = buffer->text.ptr + buffer->current;
398 buffer->current += len;
400 if (ptr[len - 1] == '\n') {
405 fputs(diff_get_color(1, color), file);
406 fwrite(ptr, len, 1, file);
407 fputs(diff_get_color(1, DIFF_RESET), file);
410 if (suppress_newline)
411 buffer->suppressed_newline = 1;
417 static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
419 struct diff_words_data *diff_words = priv;
421 if (diff_words->minus.suppressed_newline) {
423 putc('\n', diff_words->file);
424 diff_words->minus.suppressed_newline = 0;
430 print_word(diff_words->file,
431 &diff_words->minus, len, DIFF_FILE_OLD, 1);
434 print_word(diff_words->file,
435 &diff_words->plus, len, DIFF_FILE_NEW, 0);
438 print_word(diff_words->file,
439 &diff_words->plus, len, DIFF_PLAIN, 0);
440 diff_words->minus.current += len;
445 /* this executes the word diff on the accumulated buffers */
446 static void diff_words_show(struct diff_words_data *diff_words)
451 mmfile_t minus, plus;
454 memset(&xecfg, 0, sizeof(xecfg));
455 minus.size = diff_words->minus.text.size;
456 minus.ptr = xmalloc(minus.size);
457 memcpy(minus.ptr, diff_words->minus.text.ptr, minus.size);
458 for (i = 0; i < minus.size; i++)
459 if (isspace(minus.ptr[i]))
461 diff_words->minus.current = 0;
463 plus.size = diff_words->plus.text.size;
464 plus.ptr = xmalloc(plus.size);
465 memcpy(plus.ptr, diff_words->plus.text.ptr, plus.size);
466 for (i = 0; i < plus.size; i++)
467 if (isspace(plus.ptr[i]))
469 diff_words->plus.current = 0;
471 xpp.flags = XDF_NEED_MINIMAL;
472 xecfg.ctxlen = diff_words->minus.alloc + diff_words->plus.alloc;
473 ecb.outf = xdiff_outf;
474 ecb.priv = diff_words;
475 diff_words->xm.consume = fn_out_diff_words_aux;
476 xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb);
480 diff_words->minus.text.size = diff_words->plus.text.size = 0;
482 if (diff_words->minus.suppressed_newline) {
483 putc('\n', diff_words->file);
484 diff_words->minus.suppressed_newline = 0;
488 typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
490 struct emit_callback {
491 struct xdiff_emit_state xm;
494 sane_truncate_fn truncate;
495 const char **label_path;
496 struct diff_words_data *diff_words;
501 static void free_diff_words_data(struct emit_callback *ecbdata)
503 if (ecbdata->diff_words) {
505 if (ecbdata->diff_words->minus.text.size ||
506 ecbdata->diff_words->plus.text.size)
507 diff_words_show(ecbdata->diff_words);
509 free (ecbdata->diff_words->minus.text.ptr);
510 free (ecbdata->diff_words->plus.text.ptr);
511 free(ecbdata->diff_words);
512 ecbdata->diff_words = NULL;
516 const char *diff_get_color(int diff_use_color, enum color_diff ix)
519 return diff_colors[ix];
523 static void emit_line(FILE *file, const char *set, const char *reset, const char *line, int len)
525 int has_trailing_newline, has_trailing_carriage_return;
527 has_trailing_newline = (len > 0 && line[len-1] == '\n');
528 if (has_trailing_newline)
530 has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
531 if (has_trailing_carriage_return)
535 fwrite(line, len, 1, file);
537 if (has_trailing_carriage_return)
539 if (has_trailing_newline)
543 static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len)
545 const char *ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
546 const char *set = diff_get_color(ecbdata->color_diff, DIFF_FILE_NEW);
549 emit_line(ecbdata->file, set, reset, line, len);
551 /* Emit just the prefix, then the rest. */
552 emit_line(ecbdata->file, set, reset, line, 1);
553 ws_check_emit(line + 1, len - 1, ecbdata->ws_rule,
554 ecbdata->file, set, reset, ws);
558 static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len)
565 return ecb->truncate(line, len);
569 (void) utf8_width(&cp, &l);
571 break; /* truncated in the middle? */
576 static void fn_out_consume(void *priv, char *line, unsigned long len)
579 struct emit_callback *ecbdata = priv;
580 const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
581 const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);
582 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
584 *(ecbdata->found_changesp) = 1;
586 if (ecbdata->label_path[0]) {
587 const char *name_a_tab, *name_b_tab;
589 name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
590 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
592 fprintf(ecbdata->file, "%s--- %s%s%s\n",
593 meta, ecbdata->label_path[0], reset, name_a_tab);
594 fprintf(ecbdata->file, "%s+++ %s%s%s\n",
595 meta, ecbdata->label_path[1], reset, name_b_tab);
596 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
599 if (line[0] == '@') {
600 len = sane_truncate_line(ecbdata, line, len);
601 emit_line(ecbdata->file,
602 diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO),
604 if (line[len-1] != '\n')
605 putc('\n', ecbdata->file);
610 emit_line(ecbdata->file, reset, reset, line, len);
615 if (ecbdata->diff_words) {
616 if (line[0] == '-') {
617 diff_words_append(line, len,
618 &ecbdata->diff_words->minus);
620 } else if (line[0] == '+') {
621 diff_words_append(line, len,
622 &ecbdata->diff_words->plus);
625 if (ecbdata->diff_words->minus.text.size ||
626 ecbdata->diff_words->plus.text.size)
627 diff_words_show(ecbdata->diff_words);
630 emit_line(ecbdata->file, plain, reset, line, len);
634 color = DIFF_FILE_OLD;
635 else if (line[0] == '+')
636 color = DIFF_FILE_NEW;
637 if (color != DIFF_FILE_NEW) {
638 emit_line(ecbdata->file,
639 diff_get_color(ecbdata->color_diff, color),
643 emit_add_line(reset, ecbdata, line, len);
646 static char *pprint_rename(const char *a, const char *b)
651 int pfx_length, sfx_length;
652 int len_a = strlen(a);
653 int len_b = strlen(b);
654 int a_midlen, b_midlen;
655 int qlen_a = quote_c_style(a, NULL, NULL, 0);
656 int qlen_b = quote_c_style(b, NULL, NULL, 0);
658 strbuf_init(&name, 0);
659 if (qlen_a || qlen_b) {
660 quote_c_style(a, &name, NULL, 0);
661 strbuf_addstr(&name, " => ");
662 quote_c_style(b, &name, NULL, 0);
663 return strbuf_detach(&name, NULL);
666 /* Find common prefix */
668 while (*old && *new && *old == *new) {
670 pfx_length = old - a + 1;
675 /* Find common suffix */
679 while (a <= old && b <= new && *old == *new) {
681 sfx_length = len_a - (old - a);
687 * pfx{mid-a => mid-b}sfx
688 * {pfx-a => pfx-b}sfx
689 * pfx{sfx-a => sfx-b}
692 a_midlen = len_a - pfx_length - sfx_length;
693 b_midlen = len_b - pfx_length - sfx_length;
699 strbuf_grow(&name, pfx_length + a_midlen + b_midlen + sfx_length + 7);
700 if (pfx_length + sfx_length) {
701 strbuf_add(&name, a, pfx_length);
702 strbuf_addch(&name, '{');
704 strbuf_add(&name, a + pfx_length, a_midlen);
705 strbuf_addstr(&name, " => ");
706 strbuf_add(&name, b + pfx_length, b_midlen);
707 if (pfx_length + sfx_length) {
708 strbuf_addch(&name, '}');
709 strbuf_add(&name, a + len_a - sfx_length, sfx_length);
711 return strbuf_detach(&name, NULL);
715 struct xdiff_emit_state xm;
719 struct diffstat_file {
723 unsigned is_unmerged:1;
724 unsigned is_binary:1;
725 unsigned is_renamed:1;
726 unsigned int added, deleted;
730 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
734 struct diffstat_file *x;
735 x = xcalloc(sizeof (*x), 1);
736 if (diffstat->nr == diffstat->alloc) {
737 diffstat->alloc = alloc_nr(diffstat->alloc);
738 diffstat->files = xrealloc(diffstat->files,
739 diffstat->alloc * sizeof(x));
741 diffstat->files[diffstat->nr++] = x;
743 x->from_name = xstrdup(name_a);
744 x->name = xstrdup(name_b);
749 x->name = xstrdup(name_a);
754 static void diffstat_consume(void *priv, char *line, unsigned long len)
756 struct diffstat_t *diffstat = priv;
757 struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
761 else if (line[0] == '-')
765 const char mime_boundary_leader[] = "------------";
767 static int scale_linear(int it, int width, int max_change)
770 * make sure that at least one '-' is printed if there were deletions,
771 * and likewise for '+'.
775 return ((it - 1) * (width - 1) + max_change - 1) / (max_change - 1);
778 static void show_name(FILE *file,
779 const char *prefix, const char *name, int len,
780 const char *reset, const char *set)
782 fprintf(file, " %s%s%-*s%s |", set, prefix, len, name, reset);
785 static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
789 fprintf(file, "%s", set);
792 fprintf(file, "%s", reset);
795 static void fill_print_name(struct diffstat_file *file)
799 if (file->print_name)
802 if (!file->is_renamed) {
804 strbuf_init(&buf, 0);
805 if (quote_c_style(file->name, &buf, NULL, 0)) {
806 pname = strbuf_detach(&buf, NULL);
809 strbuf_release(&buf);
812 pname = pprint_rename(file->from_name, file->name);
814 file->print_name = pname;
817 static void show_stats(struct diffstat_t* data, struct diff_options *options)
819 int i, len, add, del, total, adds = 0, dels = 0;
820 int max_change = 0, max_len = 0;
821 int total_files = data->nr;
822 int width, name_width;
823 const char *reset, *set, *add_c, *del_c;
828 width = options->stat_width ? options->stat_width : 80;
829 name_width = options->stat_name_width ? options->stat_name_width : 50;
831 /* Sanity: give at least 5 columns to the graph,
832 * but leave at least 10 columns for the name.
838 else if (width < name_width + 15)
839 name_width = width - 15;
841 /* Find the longest filename and max number of changes */
842 reset = diff_get_color_opt(options, DIFF_RESET);
843 set = diff_get_color_opt(options, DIFF_PLAIN);
844 add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
845 del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
847 for (i = 0; i < data->nr; i++) {
848 struct diffstat_file *file = data->files[i];
849 int change = file->added + file->deleted;
850 fill_print_name(file);
851 len = strlen(file->print_name);
855 if (file->is_binary || file->is_unmerged)
857 if (max_change < change)
861 /* Compute the width of the graph part;
862 * 10 is for one blank at the beginning of the line plus
863 * " | count " between the name and the graph.
865 * From here on, name_width is the width of the name area,
866 * and width is the width of the graph area.
868 name_width = (name_width < max_len) ? name_width : max_len;
869 if (width < (name_width + 10) + max_change)
870 width = width - (name_width + 10);
874 for (i = 0; i < data->nr; i++) {
875 const char *prefix = "";
876 char *name = data->files[i]->print_name;
877 int added = data->files[i]->added;
878 int deleted = data->files[i]->deleted;
882 * "scale" the filename
885 name_len = strlen(name);
886 if (name_width < name_len) {
890 name += name_len - len;
891 slash = strchr(name, '/');
896 if (data->files[i]->is_binary) {
897 show_name(options->file, prefix, name, len, reset, set);
898 fprintf(options->file, " Bin ");
899 fprintf(options->file, "%s%d%s", del_c, deleted, reset);
900 fprintf(options->file, " -> ");
901 fprintf(options->file, "%s%d%s", add_c, added, reset);
902 fprintf(options->file, " bytes");
903 fprintf(options->file, "\n");
906 else if (data->files[i]->is_unmerged) {
907 show_name(options->file, prefix, name, len, reset, set);
908 fprintf(options->file, " Unmerged\n");
911 else if (!data->files[i]->is_renamed &&
912 (added + deleted == 0)) {
918 * scale the add/delete
926 if (width <= max_change) {
927 add = scale_linear(add, width, max_change);
928 del = scale_linear(del, width, max_change);
931 show_name(options->file, prefix, name, len, reset, set);
932 fprintf(options->file, "%5d%s", added + deleted,
933 added + deleted ? " " : "");
934 show_graph(options->file, '+', add, add_c, reset);
935 show_graph(options->file, '-', del, del_c, reset);
936 fprintf(options->file, "\n");
938 fprintf(options->file,
939 "%s %d files changed, %d insertions(+), %d deletions(-)%s\n",
940 set, total_files, adds, dels, reset);
943 static void show_shortstats(struct diffstat_t* data, struct diff_options *options)
945 int i, adds = 0, dels = 0, total_files = data->nr;
950 for (i = 0; i < data->nr; i++) {
951 if (!data->files[i]->is_binary &&
952 !data->files[i]->is_unmerged) {
953 int added = data->files[i]->added;
954 int deleted= data->files[i]->deleted;
955 if (!data->files[i]->is_renamed &&
956 (added + deleted == 0)) {
964 fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n",
965 total_files, adds, dels);
968 static void show_numstat(struct diffstat_t* data, struct diff_options *options)
975 for (i = 0; i < data->nr; i++) {
976 struct diffstat_file *file = data->files[i];
979 fprintf(options->file, "-\t-\t");
981 fprintf(options->file,
982 "%d\t%d\t", file->added, file->deleted);
983 if (options->line_termination) {
984 fill_print_name(file);
985 if (!file->is_renamed)
986 write_name_quoted(file->name, options->file,
987 options->line_termination);
989 fputs(file->print_name, options->file);
990 putc(options->line_termination, options->file);
993 if (file->is_renamed) {
994 putc('\0', options->file);
995 write_name_quoted(file->from_name, options->file, '\0');
997 write_name_quoted(file->name, options->file, '\0');
1002 struct dirstat_file {
1004 unsigned long changed;
1007 struct dirstat_dir {
1008 struct dirstat_file *files;
1009 int alloc, nr, percent, cumulative;
1012 static long gather_dirstat(FILE *file, struct dirstat_dir *dir, unsigned long changed, const char *base, int baselen)
1014 unsigned long this_dir = 0;
1015 unsigned int sources = 0;
1018 struct dirstat_file *f = dir->files;
1019 int namelen = strlen(f->name);
1023 if (namelen < baselen)
1025 if (memcmp(f->name, base, baselen))
1027 slash = strchr(f->name + baselen, '/');
1029 int newbaselen = slash + 1 - f->name;
1030 this = gather_dirstat(file, dir, changed, f->name, newbaselen);
1042 * We don't report dirstat's for
1044 * - or cases where everything came from a single directory
1045 * under this directory (sources == 1).
1047 if (baselen && sources != 1) {
1048 int permille = this_dir * 1000 / changed;
1050 int percent = permille / 10;
1051 if (percent >= dir->percent) {
1052 fprintf(file, "%4d.%01d%% %.*s\n", percent, permille % 10, baselen, base);
1053 if (!dir->cumulative)
1061 static int dirstat_compare(const void *_a, const void *_b)
1063 const struct dirstat_file *a = _a;
1064 const struct dirstat_file *b = _b;
1065 return strcmp(a->name, b->name);
1068 static void show_dirstat(struct diff_options *options)
1071 unsigned long changed;
1072 struct dirstat_dir dir;
1073 struct diff_queue_struct *q = &diff_queued_diff;
1078 dir.percent = options->dirstat_percent;
1079 dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
1082 for (i = 0; i < q->nr; i++) {
1083 struct diff_filepair *p = q->queue[i];
1085 unsigned long copied, added, damage;
1087 name = p->one->path ? p->one->path : p->two->path;
1089 if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
1090 diff_populate_filespec(p->one, 0);
1091 diff_populate_filespec(p->two, 0);
1092 diffcore_count_changes(p->one, p->two, NULL, NULL, 0,
1094 diff_free_filespec_data(p->one);
1095 diff_free_filespec_data(p->two);
1096 } else if (DIFF_FILE_VALID(p->one)) {
1097 diff_populate_filespec(p->one, 1);
1099 diff_free_filespec_data(p->one);
1100 } else if (DIFF_FILE_VALID(p->two)) {
1101 diff_populate_filespec(p->two, 1);
1103 added = p->two->size;
1104 diff_free_filespec_data(p->two);
1109 * Original minus copied is the removed material,
1110 * added is the new material. They are both damages
1111 * made to the preimage.
1113 damage = (p->one->size - copied) + added;
1115 ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
1116 dir.files[dir.nr].name = name;
1117 dir.files[dir.nr].changed = damage;
1122 /* This can happen even with many files, if everything was renames */
1126 /* Show all directories with more than x% of the changes */
1127 qsort(dir.files, dir.nr, sizeof(dir.files[0]), dirstat_compare);
1128 gather_dirstat(options->file, &dir, changed, "", 0);
1131 static void free_diffstat_info(struct diffstat_t *diffstat)
1134 for (i = 0; i < diffstat->nr; i++) {
1135 struct diffstat_file *f = diffstat->files[i];
1136 if (f->name != f->print_name)
1137 free(f->print_name);
1142 free(diffstat->files);
1145 struct checkdiff_t {
1146 struct xdiff_emit_state xm;
1147 const char *filename;
1149 struct diff_options *o;
1152 int trailing_blanks_start;
1155 static int is_conflict_marker(const char *line, unsigned long len)
1162 firstchar = line[0];
1163 switch (firstchar) {
1164 case '=': case '>': case '<':
1169 for (cnt = 1; cnt < 7; cnt++)
1170 if (line[cnt] != firstchar)
1172 /* line[0] thru line[6] are same as firstchar */
1173 if (firstchar == '=') {
1174 /* divider between ours and theirs? */
1175 if (len != 8 || line[7] != '\n')
1177 } else if (len < 8 || !isspace(line[7])) {
1178 /* not divider before ours nor after theirs */
1184 static void checkdiff_consume(void *priv, char *line, unsigned long len)
1186 struct checkdiff_t *data = priv;
1187 int color_diff = DIFF_OPT_TST(data->o, COLOR_DIFF);
1188 const char *ws = diff_get_color(color_diff, DIFF_WHITESPACE);
1189 const char *reset = diff_get_color(color_diff, DIFF_RESET);
1190 const char *set = diff_get_color(color_diff, DIFF_FILE_NEW);
1193 if (line[0] == '+') {
1196 if (!ws_blank_line(line + 1, len - 1, data->ws_rule))
1197 data->trailing_blanks_start = 0;
1198 else if (!data->trailing_blanks_start)
1199 data->trailing_blanks_start = data->lineno;
1200 if (is_conflict_marker(line + 1, len - 1)) {
1202 fprintf(data->o->file,
1203 "%s:%d: leftover conflict marker\n",
1204 data->filename, data->lineno);
1206 bad = ws_check(line + 1, len - 1, data->ws_rule);
1209 data->status |= bad;
1210 err = whitespace_error_string(bad);
1211 fprintf(data->o->file, "%s:%d: %s.\n",
1212 data->filename, data->lineno, err);
1214 emit_line(data->o->file, set, reset, line, 1);
1215 ws_check_emit(line + 1, len - 1, data->ws_rule,
1216 data->o->file, set, reset, ws);
1217 } else if (line[0] == ' ') {
1219 data->trailing_blanks_start = 0;
1220 } else if (line[0] == '@') {
1221 char *plus = strchr(line, '+');
1223 data->lineno = strtol(plus, NULL, 10) - 1;
1225 die("invalid diff");
1226 data->trailing_blanks_start = 0;
1230 static unsigned char *deflate_it(char *data,
1232 unsigned long *result_size)
1235 unsigned char *deflated;
1238 memset(&stream, 0, sizeof(stream));
1239 deflateInit(&stream, zlib_compression_level);
1240 bound = deflateBound(&stream, size);
1241 deflated = xmalloc(bound);
1242 stream.next_out = deflated;
1243 stream.avail_out = bound;
1245 stream.next_in = (unsigned char *)data;
1246 stream.avail_in = size;
1247 while (deflate(&stream, Z_FINISH) == Z_OK)
1249 deflateEnd(&stream);
1250 *result_size = stream.total_out;
1254 static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two)
1260 unsigned long orig_size;
1261 unsigned long delta_size;
1262 unsigned long deflate_size;
1263 unsigned long data_size;
1265 /* We could do deflated delta, or we could do just deflated two,
1266 * whichever is smaller.
1269 deflated = deflate_it(two->ptr, two->size, &deflate_size);
1270 if (one->size && two->size) {
1271 delta = diff_delta(one->ptr, one->size,
1272 two->ptr, two->size,
1273 &delta_size, deflate_size);
1275 void *to_free = delta;
1276 orig_size = delta_size;
1277 delta = deflate_it(delta, delta_size, &delta_size);
1282 if (delta && delta_size < deflate_size) {
1283 fprintf(file, "delta %lu\n", orig_size);
1286 data_size = delta_size;
1289 fprintf(file, "literal %lu\n", two->size);
1292 data_size = deflate_size;
1295 /* emit data encoded in base85 */
1298 int bytes = (52 < data_size) ? 52 : data_size;
1302 line[0] = bytes + 'A' - 1;
1304 line[0] = bytes - 26 + 'a' - 1;
1305 encode_85(line + 1, cp, bytes);
1306 cp = (char *) cp + bytes;
1310 fprintf(file, "\n");
1314 static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two)
1316 fprintf(file, "GIT binary patch\n");
1317 emit_binary_diff_body(file, one, two);
1318 emit_binary_diff_body(file, two, one);
1321 static void setup_diff_attr_check(struct git_attr_check *check)
1323 static struct git_attr *attr_diff;
1326 attr_diff = git_attr("diff", 4);
1328 check[0].attr = attr_diff;
1331 static void diff_filespec_check_attr(struct diff_filespec *one)
1333 struct git_attr_check attr_diff_check;
1334 int check_from_data = 0;
1336 if (one->checked_attr)
1339 setup_diff_attr_check(&attr_diff_check);
1341 one->funcname_pattern_ident = NULL;
1343 if (!git_checkattr(one->path, 1, &attr_diff_check)) {
1347 value = attr_diff_check.value;
1348 if (ATTR_TRUE(value))
1350 else if (ATTR_FALSE(value))
1353 check_from_data = 1;
1355 /* funcname pattern ident */
1356 if (ATTR_TRUE(value) || ATTR_FALSE(value) || ATTR_UNSET(value))
1359 one->funcname_pattern_ident = value;
1362 if (check_from_data) {
1363 if (!one->data && DIFF_FILE_VALID(one))
1364 diff_populate_filespec(one, 0);
1367 one->is_binary = buffer_is_binary(one->data, one->size);
1371 int diff_filespec_is_binary(struct diff_filespec *one)
1373 diff_filespec_check_attr(one);
1374 return one->is_binary;
1377 static const struct funcname_pattern_entry *funcname_pattern(const char *ident)
1379 struct funcname_pattern_list *pp;
1381 for (pp = funcname_pattern_list; pp; pp = pp->next)
1382 if (!strcmp(ident, pp->e.name))
1387 static const struct funcname_pattern_entry builtin_funcname_pattern[] = {
1389 "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
1390 "^[ \t]*(([ \t]*[A-Za-z_][A-Za-z_0-9]*){2,}[ \t]*\\([^;]*)$",
1393 "^((procedure|function|constructor|destructor|interface|"
1394 "implementation|initialization|finalization)[ \t]*.*)$"
1396 "^(.*=[ \t]*(class|record).*)$",
1398 { "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
1401 "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
1403 { "ruby", "^[ \t]*((class|module|def)[ \t].*)$",
1407 static const struct funcname_pattern_entry *diff_funcname_pattern(struct diff_filespec *one)
1410 const struct funcname_pattern_entry *pe;
1413 diff_filespec_check_attr(one);
1414 ident = one->funcname_pattern_ident;
1418 * If the config file has "funcname.default" defined, that
1419 * regexp is used; otherwise NULL is returned and xemit uses
1420 * the built-in default.
1422 return funcname_pattern("default");
1424 /* Look up custom "funcname.$ident" regexp from config. */
1425 pe = funcname_pattern(ident);
1430 * And define built-in fallback patterns here. Note that
1431 * these can be overridden by the user's config settings.
1433 for (i = 0; i < ARRAY_SIZE(builtin_funcname_pattern); i++)
1434 if (!strcmp(ident, builtin_funcname_pattern[i].name))
1435 return &builtin_funcname_pattern[i];
1440 static void builtin_diff(const char *name_a,
1442 struct diff_filespec *one,
1443 struct diff_filespec *two,
1444 const char *xfrm_msg,
1445 struct diff_options *o,
1446 int complete_rewrite)
1450 char *a_one, *b_two;
1451 const char *set = diff_get_color_opt(o, DIFF_METAINFO);
1452 const char *reset = diff_get_color_opt(o, DIFF_RESET);
1454 /* Never use a non-valid filename anywhere if at all possible */
1455 name_a = DIFF_FILE_VALID(one) ? name_a : name_b;
1456 name_b = DIFF_FILE_VALID(two) ? name_b : name_a;
1458 a_one = quote_two(o->a_prefix, name_a + (*name_a == '/'));
1459 b_two = quote_two(o->b_prefix, name_b + (*name_b == '/'));
1460 lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
1461 lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
1462 fprintf(o->file, "%sdiff --git %s %s%s\n", set, a_one, b_two, reset);
1463 if (lbl[0][0] == '/') {
1465 fprintf(o->file, "%snew file mode %06o%s\n", set, two->mode, reset);
1466 if (xfrm_msg && xfrm_msg[0])
1467 fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1469 else if (lbl[1][0] == '/') {
1470 fprintf(o->file, "%sdeleted file mode %06o%s\n", set, one->mode, reset);
1471 if (xfrm_msg && xfrm_msg[0])
1472 fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1475 if (one->mode != two->mode) {
1476 fprintf(o->file, "%sold mode %06o%s\n", set, one->mode, reset);
1477 fprintf(o->file, "%snew mode %06o%s\n", set, two->mode, reset);
1479 if (xfrm_msg && xfrm_msg[0])
1480 fprintf(o->file, "%s%s%s\n", set, xfrm_msg, reset);
1482 * we do not run diff between different kind
1485 if ((one->mode ^ two->mode) & S_IFMT)
1486 goto free_ab_and_return;
1487 if (complete_rewrite) {
1488 emit_rewrite_diff(name_a, name_b, one, two, o);
1489 o->found_changes = 1;
1490 goto free_ab_and_return;
1494 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1495 die("unable to read files to diff");
1497 if (!DIFF_OPT_TST(o, TEXT) &&
1498 (diff_filespec_is_binary(one) || diff_filespec_is_binary(two))) {
1499 /* Quite common confusing case */
1500 if (mf1.size == mf2.size &&
1501 !memcmp(mf1.ptr, mf2.ptr, mf1.size))
1502 goto free_ab_and_return;
1503 if (DIFF_OPT_TST(o, BINARY))
1504 emit_binary_diff(o->file, &mf1, &mf2);
1506 fprintf(o->file, "Binary files %s and %s differ\n",
1508 o->found_changes = 1;
1511 /* Crazy xdl interfaces.. */
1512 const char *diffopts = getenv("GIT_DIFF_OPTS");
1516 struct emit_callback ecbdata;
1517 const struct funcname_pattern_entry *pe;
1519 pe = diff_funcname_pattern(one);
1521 pe = diff_funcname_pattern(two);
1523 memset(&xecfg, 0, sizeof(xecfg));
1524 memset(&ecbdata, 0, sizeof(ecbdata));
1525 ecbdata.label_path = lbl;
1526 ecbdata.color_diff = DIFF_OPT_TST(o, COLOR_DIFF);
1527 ecbdata.found_changesp = &o->found_changes;
1528 ecbdata.ws_rule = whitespace_rule(name_b ? name_b : name_a);
1529 ecbdata.file = o->file;
1530 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1531 xecfg.ctxlen = o->context;
1532 xecfg.flags = XDL_EMIT_FUNCNAMES;
1534 xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
1537 else if (!prefixcmp(diffopts, "--unified="))
1538 xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
1539 else if (!prefixcmp(diffopts, "-u"))
1540 xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
1541 ecb.outf = xdiff_outf;
1542 ecb.priv = &ecbdata;
1543 ecbdata.xm.consume = fn_out_consume;
1544 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) {
1545 ecbdata.diff_words =
1546 xcalloc(1, sizeof(struct diff_words_data));
1547 ecbdata.diff_words->file = o->file;
1549 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
1550 if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
1551 free_diff_words_data(&ecbdata);
1555 diff_free_filespec_data(one);
1556 diff_free_filespec_data(two);
1562 static void builtin_diffstat(const char *name_a, const char *name_b,
1563 struct diff_filespec *one,
1564 struct diff_filespec *two,
1565 struct diffstat_t *diffstat,
1566 struct diff_options *o,
1567 int complete_rewrite)
1570 struct diffstat_file *data;
1572 data = diffstat_add(diffstat, name_a, name_b);
1575 data->is_unmerged = 1;
1578 if (complete_rewrite) {
1579 diff_populate_filespec(one, 0);
1580 diff_populate_filespec(two, 0);
1581 data->deleted = count_lines(one->data, one->size);
1582 data->added = count_lines(two->data, two->size);
1583 goto free_and_return;
1585 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1586 die("unable to read files to diff");
1588 if (diff_filespec_is_binary(one) || diff_filespec_is_binary(two)) {
1589 data->is_binary = 1;
1590 data->added = mf2.size;
1591 data->deleted = mf1.size;
1593 /* Crazy xdl interfaces.. */
1598 memset(&xecfg, 0, sizeof(xecfg));
1599 xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1600 ecb.outf = xdiff_outf;
1601 ecb.priv = diffstat;
1602 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
1606 diff_free_filespec_data(one);
1607 diff_free_filespec_data(two);
1610 static void builtin_checkdiff(const char *name_a, const char *name_b,
1611 const char *attr_path,
1612 struct diff_filespec *one,
1613 struct diff_filespec *two,
1614 struct diff_options *o)
1617 struct checkdiff_t data;
1622 memset(&data, 0, sizeof(data));
1623 data.xm.consume = checkdiff_consume;
1624 data.filename = name_b ? name_b : name_a;
1627 data.ws_rule = whitespace_rule(attr_path);
1629 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1630 die("unable to read files to diff");
1633 * All the other codepaths check both sides, but not checking
1634 * the "old" side here is deliberate. We are checking the newly
1635 * introduced changes, and as long as the "new" side is text, we
1636 * can and should check what it introduces.
1638 if (diff_filespec_is_binary(two))
1639 goto free_and_return;
1641 /* Crazy xdl interfaces.. */
1646 memset(&xecfg, 0, sizeof(xecfg));
1647 xecfg.ctxlen = 1; /* at least one context line */
1648 xpp.flags = XDF_NEED_MINIMAL;
1649 ecb.outf = xdiff_outf;
1651 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
1653 if ((data.ws_rule & WS_BLANK_AT_EOF) &&
1654 data.trailing_blanks_start) {
1658 err = whitespace_error_string(WS_BLANK_AT_EOF);
1659 fprintf(o->file, "%s:%d: %s\n",
1660 data.filename, data.trailing_blanks_start, err);
1661 data.status = 1; /* report errors */
1665 diff_free_filespec_data(one);
1666 diff_free_filespec_data(two);
1668 DIFF_OPT_SET(o, CHECK_FAILED);
1671 struct diff_filespec *alloc_filespec(const char *path)
1673 int namelen = strlen(path);
1674 struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1);
1676 memset(spec, 0, sizeof(*spec));
1677 spec->path = (char *)(spec + 1);
1678 memcpy(spec->path, path, namelen+1);
1683 void free_filespec(struct diff_filespec *spec)
1685 if (!--spec->count) {
1686 diff_free_filespec_data(spec);
1691 void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
1692 unsigned short mode)
1695 spec->mode = canon_mode(mode);
1696 hashcpy(spec->sha1, sha1);
1697 spec->sha1_valid = !is_null_sha1(sha1);
1702 * Given a name and sha1 pair, if the index tells us the file in
1703 * the work tree has that object contents, return true, so that
1704 * prepare_temp_file() does not have to inflate and extract.
1706 static int reuse_worktree_file(const char *name, const unsigned char *sha1, int want_file)
1708 struct cache_entry *ce;
1712 /* We do not read the cache ourselves here, because the
1713 * benchmark with my previous version that always reads cache
1714 * shows that it makes things worse for diff-tree comparing
1715 * two linux-2.6 kernel trees in an already checked out work
1716 * tree. This is because most diff-tree comparisons deal with
1717 * only a small number of files, while reading the cache is
1718 * expensive for a large project, and its cost outweighs the
1719 * savings we get by not inflating the object to a temporary
1720 * file. Practically, this code only helps when we are used
1721 * by diff-cache --cached, which does read the cache before
1727 /* We want to avoid the working directory if our caller
1728 * doesn't need the data in a normal file, this system
1729 * is rather slow with its stat/open/mmap/close syscalls,
1730 * and the object is contained in a pack file. The pack
1731 * is probably already open and will be faster to obtain
1732 * the data through than the working directory. Loose
1733 * objects however would tend to be slower as they need
1734 * to be individually opened and inflated.
1736 if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))
1740 pos = cache_name_pos(name, len);
1743 ce = active_cache[pos];
1746 * This is not the sha1 we are looking for, or
1747 * unreusable because it is not a regular file.
1749 if (hashcmp(sha1, ce->sha1) || !S_ISREG(ce->ce_mode))
1753 * If ce matches the file in the work tree, we can reuse it.
1755 if (ce_uptodate(ce) ||
1756 (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
1762 static int populate_from_stdin(struct diff_filespec *s)
1767 strbuf_init(&buf, 0);
1768 if (strbuf_read(&buf, 0, 0) < 0)
1769 return error("error while reading from stdin %s",
1772 s->should_munmap = 0;
1773 s->data = strbuf_detach(&buf, &size);
1779 static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
1782 char *data = xmalloc(100);
1783 len = snprintf(data, 100,
1784 "Subproject commit %s\n", sha1_to_hex(s->sha1));
1796 * While doing rename detection and pickaxe operation, we may need to
1797 * grab the data for the blob (or file) for our own in-core comparison.
1798 * diff_filespec has data and size fields for this purpose.
1800 int diff_populate_filespec(struct diff_filespec *s, int size_only)
1803 if (!DIFF_FILE_VALID(s))
1804 die("internal error: asking to populate invalid file.");
1805 if (S_ISDIR(s->mode))
1811 if (size_only && 0 < s->size)
1814 if (S_ISGITLINK(s->mode))
1815 return diff_populate_gitlink(s, size_only);
1817 if (!s->sha1_valid ||
1818 reuse_worktree_file(s->path, s->sha1, 0)) {
1823 if (!strcmp(s->path, "-"))
1824 return populate_from_stdin(s);
1826 if (lstat(s->path, &st) < 0) {
1827 if (errno == ENOENT) {
1831 s->data = (char *)"";
1836 s->size = xsize_t(st.st_size);
1841 if (S_ISLNK(st.st_mode)) {
1843 s->data = xmalloc(s->size);
1845 ret = readlink(s->path, s->data, s->size);
1852 fd = open(s->path, O_RDONLY);
1855 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
1857 s->should_munmap = 1;
1860 * Convert from working tree format to canonical git format
1862 strbuf_init(&buf, 0);
1863 if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
1865 munmap(s->data, s->size);
1866 s->should_munmap = 0;
1867 s->data = strbuf_detach(&buf, &size);
1873 enum object_type type;
1875 type = sha1_object_info(s->sha1, &s->size);
1877 s->data = read_sha1_file(s->sha1, &type, &s->size);
1884 void diff_free_filespec_blob(struct diff_filespec *s)
1888 else if (s->should_munmap)
1889 munmap(s->data, s->size);
1891 if (s->should_free || s->should_munmap) {
1892 s->should_free = s->should_munmap = 0;
1897 void diff_free_filespec_data(struct diff_filespec *s)
1899 diff_free_filespec_blob(s);
1904 static void prep_temp_blob(struct diff_tempfile *temp,
1907 const unsigned char *sha1,
1912 fd = git_mkstemp(temp->tmp_path, PATH_MAX, ".diff_XXXXXX");
1914 die("unable to create temp-file: %s", strerror(errno));
1915 if (write_in_full(fd, blob, size) != size)
1916 die("unable to write temp-file");
1918 temp->name = temp->tmp_path;
1919 strcpy(temp->hex, sha1_to_hex(sha1));
1921 sprintf(temp->mode, "%06o", mode);
1924 static void prepare_temp_file(const char *name,
1925 struct diff_tempfile *temp,
1926 struct diff_filespec *one)
1928 if (!DIFF_FILE_VALID(one)) {
1930 /* A '-' entry produces this for file-2, and
1931 * a '+' entry produces this for file-1.
1933 temp->name = "/dev/null";
1934 strcpy(temp->hex, ".");
1935 strcpy(temp->mode, ".");
1939 if (!one->sha1_valid ||
1940 reuse_worktree_file(name, one->sha1, 1)) {
1942 if (lstat(name, &st) < 0) {
1943 if (errno == ENOENT)
1944 goto not_a_valid_file;
1945 die("stat(%s): %s", name, strerror(errno));
1947 if (S_ISLNK(st.st_mode)) {
1949 char buf[PATH_MAX + 1]; /* ought to be SYMLINK_MAX */
1950 size_t sz = xsize_t(st.st_size);
1951 if (sizeof(buf) <= st.st_size)
1952 die("symlink too long: %s", name);
1953 ret = readlink(name, buf, sz);
1955 die("readlink(%s)", name);
1956 prep_temp_blob(temp, buf, sz,
1958 one->sha1 : null_sha1),
1960 one->mode : S_IFLNK));
1963 /* we can borrow from the file in the work tree */
1965 if (!one->sha1_valid)
1966 strcpy(temp->hex, sha1_to_hex(null_sha1));
1968 strcpy(temp->hex, sha1_to_hex(one->sha1));
1969 /* Even though we may sometimes borrow the
1970 * contents from the work tree, we always want
1971 * one->mode. mode is trustworthy even when
1972 * !(one->sha1_valid), as long as
1973 * DIFF_FILE_VALID(one).
1975 sprintf(temp->mode, "%06o", one->mode);
1980 if (diff_populate_filespec(one, 0))
1981 die("cannot read data blob for %s", one->path);
1982 prep_temp_blob(temp, one->data, one->size,
1983 one->sha1, one->mode);
1987 static void remove_tempfile(void)
1991 for (i = 0; i < 2; i++)
1992 if (diff_temp[i].name == diff_temp[i].tmp_path) {
1993 unlink(diff_temp[i].name);
1994 diff_temp[i].name = NULL;
1998 static void remove_tempfile_on_signal(int signo)
2001 signal(SIGINT, SIG_DFL);
2005 /* An external diff command takes:
2007 * diff-cmd name infile1 infile1-sha1 infile1-mode \
2008 * infile2 infile2-sha1 infile2-mode [ rename-to ]
2011 static void run_external_diff(const char *pgm,
2014 struct diff_filespec *one,
2015 struct diff_filespec *two,
2016 const char *xfrm_msg,
2017 int complete_rewrite)
2019 const char *spawn_arg[10];
2020 struct diff_tempfile *temp = diff_temp;
2022 static int atexit_asked = 0;
2023 const char *othername;
2024 const char **arg = &spawn_arg[0];
2026 othername = (other? other : name);
2028 prepare_temp_file(name, &temp[0], one);
2029 prepare_temp_file(othername, &temp[1], two);
2030 if (! atexit_asked &&
2031 (temp[0].name == temp[0].tmp_path ||
2032 temp[1].name == temp[1].tmp_path)) {
2034 atexit(remove_tempfile);
2036 signal(SIGINT, remove_tempfile_on_signal);
2042 *arg++ = temp[0].name;
2043 *arg++ = temp[0].hex;
2044 *arg++ = temp[0].mode;
2045 *arg++ = temp[1].name;
2046 *arg++ = temp[1].hex;
2047 *arg++ = temp[1].mode;
2058 retval = run_command_v_opt(spawn_arg, 0);
2061 fprintf(stderr, "external diff died, stopping at %s.\n", name);
2066 static const char *external_diff_attr(const char *name)
2068 struct git_attr_check attr_diff_check;
2073 setup_diff_attr_check(&attr_diff_check);
2074 if (!git_checkattr(name, 1, &attr_diff_check)) {
2075 const char *value = attr_diff_check.value;
2076 if (!ATTR_TRUE(value) &&
2077 !ATTR_FALSE(value) &&
2078 !ATTR_UNSET(value)) {
2079 struct ll_diff_driver *drv;
2081 for (drv = user_diff; drv; drv = drv->next)
2082 if (!strcmp(drv->name, value))
2089 static int similarity_index(struct diff_filepair *p)
2091 return p->score * 100 / MAX_SCORE;
2094 static void fill_metainfo(struct strbuf *msg,
2097 struct diff_filespec *one,
2098 struct diff_filespec *two,
2099 struct diff_options *o,
2100 struct diff_filepair *p)
2102 strbuf_init(msg, PATH_MAX * 2 + 300);
2103 switch (p->status) {
2104 case DIFF_STATUS_COPIED:
2105 strbuf_addf(msg, "similarity index %d%%", similarity_index(p));
2106 strbuf_addstr(msg, "\ncopy from ");
2107 quote_c_style(name, msg, NULL, 0);
2108 strbuf_addstr(msg, "\ncopy to ");
2109 quote_c_style(other, msg, NULL, 0);
2110 strbuf_addch(msg, '\n');
2112 case DIFF_STATUS_RENAMED:
2113 strbuf_addf(msg, "similarity index %d%%", similarity_index(p));
2114 strbuf_addstr(msg, "\nrename from ");
2115 quote_c_style(name, msg, NULL, 0);
2116 strbuf_addstr(msg, "\nrename to ");
2117 quote_c_style(other, msg, NULL, 0);
2118 strbuf_addch(msg, '\n');
2120 case DIFF_STATUS_MODIFIED:
2122 strbuf_addf(msg, "dissimilarity index %d%%\n",
2123 similarity_index(p));
2131 if (one && two && hashcmp(one->sha1, two->sha1)) {
2132 int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
2134 if (DIFF_OPT_TST(o, BINARY)) {
2136 if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
2137 (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
2140 strbuf_addf(msg, "index %.*s..%.*s",
2141 abbrev, sha1_to_hex(one->sha1),
2142 abbrev, sha1_to_hex(two->sha1));
2143 if (one->mode == two->mode)
2144 strbuf_addf(msg, " %06o", one->mode);
2145 strbuf_addch(msg, '\n');
2148 strbuf_setlen(msg, msg->len - 1);
2151 static void run_diff_cmd(const char *pgm,
2154 const char *attr_path,
2155 struct diff_filespec *one,
2156 struct diff_filespec *two,
2158 struct diff_options *o,
2159 struct diff_filepair *p)
2161 const char *xfrm_msg = NULL;
2162 int complete_rewrite = (p->status == DIFF_STATUS_MODIFIED) && p->score;
2165 fill_metainfo(msg, name, other, one, two, o, p);
2166 xfrm_msg = msg->len ? msg->buf : NULL;
2169 if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
2172 const char *cmd = external_diff_attr(attr_path);
2178 run_external_diff(pgm, name, other, one, two, xfrm_msg,
2183 builtin_diff(name, other ? other : name,
2184 one, two, xfrm_msg, o, complete_rewrite);
2186 fprintf(o->file, "* Unmerged path %s\n", name);
2189 static void diff_fill_sha1_info(struct diff_filespec *one)
2191 if (DIFF_FILE_VALID(one)) {
2192 if (!one->sha1_valid) {
2194 if (!strcmp(one->path, "-")) {
2195 hashcpy(one->sha1, null_sha1);
2198 if (lstat(one->path, &st) < 0)
2199 die("stat %s", one->path);
2200 if (index_path(one->sha1, one->path, &st, 0))
2201 die("cannot hash %s\n", one->path);
2208 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
2210 /* Strip the prefix but do not molest /dev/null and absolute paths */
2211 if (*namep && **namep != '/')
2212 *namep += prefix_length;
2213 if (*otherp && **otherp != '/')
2214 *otherp += prefix_length;
2217 static void run_diff(struct diff_filepair *p, struct diff_options *o)
2219 const char *pgm = external_diff();
2221 struct diff_filespec *one = p->one;
2222 struct diff_filespec *two = p->two;
2225 const char *attr_path;
2227 name = p->one->path;
2228 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2230 if (o->prefix_length)
2231 strip_prefix(o->prefix_length, &name, &other);
2233 if (DIFF_PAIR_UNMERGED(p)) {
2234 run_diff_cmd(pgm, name, NULL, attr_path,
2235 NULL, NULL, NULL, o, p);
2239 diff_fill_sha1_info(one);
2240 diff_fill_sha1_info(two);
2243 DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
2244 (S_IFMT & one->mode) != (S_IFMT & two->mode)) {
2246 * a filepair that changes between file and symlink
2247 * needs to be split into deletion and creation.
2249 struct diff_filespec *null = alloc_filespec(two->path);
2250 run_diff_cmd(NULL, name, other, attr_path,
2251 one, null, &msg, o, p);
2253 strbuf_release(&msg);
2255 null = alloc_filespec(one->path);
2256 run_diff_cmd(NULL, name, other, attr_path,
2257 null, two, &msg, o, p);
2261 run_diff_cmd(pgm, name, other, attr_path,
2262 one, two, &msg, o, p);
2264 strbuf_release(&msg);
2267 static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
2268 struct diffstat_t *diffstat)
2272 int complete_rewrite = 0;
2274 if (DIFF_PAIR_UNMERGED(p)) {
2276 builtin_diffstat(p->one->path, NULL, NULL, NULL, diffstat, o, 0);
2280 name = p->one->path;
2281 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2283 if (o->prefix_length)
2284 strip_prefix(o->prefix_length, &name, &other);
2286 diff_fill_sha1_info(p->one);
2287 diff_fill_sha1_info(p->two);
2289 if (p->status == DIFF_STATUS_MODIFIED && p->score)
2290 complete_rewrite = 1;
2291 builtin_diffstat(name, other, p->one, p->two, diffstat, o, complete_rewrite);
2294 static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
2298 const char *attr_path;
2300 if (DIFF_PAIR_UNMERGED(p)) {
2305 name = p->one->path;
2306 other = (strcmp(name, p->two->path) ? p->two->path : NULL);
2307 attr_path = other ? other : name;
2309 if (o->prefix_length)
2310 strip_prefix(o->prefix_length, &name, &other);
2312 diff_fill_sha1_info(p->one);
2313 diff_fill_sha1_info(p->two);
2315 builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
2318 void diff_setup(struct diff_options *options)
2320 memset(options, 0, sizeof(*options));
2322 options->file = stdout;
2324 options->line_termination = '\n';
2325 options->break_opt = -1;
2326 options->rename_limit = -1;
2327 options->dirstat_percent = 3;
2328 DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
2329 options->context = 3;
2331 options->change = diff_change;
2332 options->add_remove = diff_addremove;
2333 if (diff_use_color_default > 0)
2334 DIFF_OPT_SET(options, COLOR_DIFF);
2336 DIFF_OPT_CLR(options, COLOR_DIFF);
2337 options->detect_rename = diff_detect_rename_default;
2339 options->a_prefix = "a/";
2340 options->b_prefix = "b/";
2343 int diff_setup_done(struct diff_options *options)
2347 if (options->output_format & DIFF_FORMAT_NAME)
2349 if (options->output_format & DIFF_FORMAT_NAME_STATUS)
2351 if (options->output_format & DIFF_FORMAT_CHECKDIFF)
2353 if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
2356 die("--name-only, --name-status, --check and -s are mutually exclusive");
2358 if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
2359 options->detect_rename = DIFF_DETECT_COPY;
2361 if (!DIFF_OPT_TST(options, RELATIVE_NAME))
2362 options->prefix = NULL;
2363 if (options->prefix)
2364 options->prefix_length = strlen(options->prefix);
2366 options->prefix_length = 0;
2368 if (options->output_format & (DIFF_FORMAT_NAME |
2369 DIFF_FORMAT_NAME_STATUS |
2370 DIFF_FORMAT_CHECKDIFF |
2371 DIFF_FORMAT_NO_OUTPUT))
2372 options->output_format &= ~(DIFF_FORMAT_RAW |
2373 DIFF_FORMAT_NUMSTAT |
2374 DIFF_FORMAT_DIFFSTAT |
2375 DIFF_FORMAT_SHORTSTAT |
2376 DIFF_FORMAT_DIRSTAT |
2377 DIFF_FORMAT_SUMMARY |
2381 * These cases always need recursive; we do not drop caller-supplied
2382 * recursive bits for other formats here.
2384 if (options->output_format & (DIFF_FORMAT_PATCH |
2385 DIFF_FORMAT_NUMSTAT |
2386 DIFF_FORMAT_DIFFSTAT |
2387 DIFF_FORMAT_SHORTSTAT |
2388 DIFF_FORMAT_DIRSTAT |
2389 DIFF_FORMAT_SUMMARY |
2390 DIFF_FORMAT_CHECKDIFF))
2391 DIFF_OPT_SET(options, RECURSIVE);
2393 * Also pickaxe would not work very well if you do not say recursive
2395 if (options->pickaxe)
2396 DIFF_OPT_SET(options, RECURSIVE);
2398 if (options->detect_rename && options->rename_limit < 0)
2399 options->rename_limit = diff_rename_limit_default;
2400 if (options->setup & DIFF_SETUP_USE_CACHE) {
2402 /* read-cache does not die even when it fails
2403 * so it is safe for us to do this here. Also
2404 * it does not smudge active_cache or active_nr
2405 * when it fails, so we do not have to worry about
2406 * cleaning it up ourselves either.
2410 if (options->abbrev <= 0 || 40 < options->abbrev)
2411 options->abbrev = 40; /* full */
2414 * It does not make sense to show the first hit we happened
2415 * to have found. It does not make sense not to return with
2416 * exit code in such a case either.
2418 if (DIFF_OPT_TST(options, QUIET)) {
2419 options->output_format = DIFF_FORMAT_NO_OUTPUT;
2420 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2426 static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
2436 if (c == arg_short) {
2440 if (val && isdigit(c)) {
2442 int n = strtoul(arg, &end, 10);
2453 eq = strchr(arg, '=');
2458 if (!len || strncmp(arg, arg_long, len))
2463 if (!isdigit(*++eq))
2465 n = strtoul(eq, &end, 10);
2473 static int diff_scoreopt_parse(const char *opt);
2475 int diff_opt_parse(struct diff_options *options, const char **av, int ac)
2477 const char *arg = av[0];
2479 /* Output format options */
2480 if (!strcmp(arg, "-p") || !strcmp(arg, "-u"))
2481 options->output_format |= DIFF_FORMAT_PATCH;
2482 else if (opt_arg(arg, 'U', "unified", &options->context))
2483 options->output_format |= DIFF_FORMAT_PATCH;
2484 else if (!strcmp(arg, "--raw"))
2485 options->output_format |= DIFF_FORMAT_RAW;
2486 else if (!strcmp(arg, "--patch-with-raw"))
2487 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW;
2488 else if (!strcmp(arg, "--numstat"))
2489 options->output_format |= DIFF_FORMAT_NUMSTAT;
2490 else if (!strcmp(arg, "--shortstat"))
2491 options->output_format |= DIFF_FORMAT_SHORTSTAT;
2492 else if (opt_arg(arg, 'X', "dirstat", &options->dirstat_percent))
2493 options->output_format |= DIFF_FORMAT_DIRSTAT;
2494 else if (!strcmp(arg, "--cumulative")) {
2495 options->output_format |= DIFF_FORMAT_DIRSTAT;
2496 DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
2498 else if (!strcmp(arg, "--check"))
2499 options->output_format |= DIFF_FORMAT_CHECKDIFF;
2500 else if (!strcmp(arg, "--summary"))
2501 options->output_format |= DIFF_FORMAT_SUMMARY;
2502 else if (!strcmp(arg, "--patch-with-stat"))
2503 options->output_format |= DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT;
2504 else if (!strcmp(arg, "--name-only"))
2505 options->output_format |= DIFF_FORMAT_NAME;
2506 else if (!strcmp(arg, "--name-status"))
2507 options->output_format |= DIFF_FORMAT_NAME_STATUS;
2508 else if (!strcmp(arg, "-s"))
2509 options->output_format |= DIFF_FORMAT_NO_OUTPUT;
2510 else if (!prefixcmp(arg, "--stat")) {
2512 int width = options->stat_width;
2513 int name_width = options->stat_name_width;
2519 if (!prefixcmp(arg, "-width="))
2520 width = strtoul(arg + 7, &end, 10);
2521 else if (!prefixcmp(arg, "-name-width="))
2522 name_width = strtoul(arg + 12, &end, 10);
2525 width = strtoul(arg+1, &end, 10);
2527 name_width = strtoul(end+1, &end, 10);
2530 /* Important! This checks all the error cases! */
2533 options->output_format |= DIFF_FORMAT_DIFFSTAT;
2534 options->stat_name_width = name_width;
2535 options->stat_width = width;
2538 /* renames options */
2539 else if (!prefixcmp(arg, "-B")) {
2540 if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
2543 else if (!prefixcmp(arg, "-M")) {
2544 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2546 options->detect_rename = DIFF_DETECT_RENAME;
2548 else if (!prefixcmp(arg, "-C")) {
2549 if (options->detect_rename == DIFF_DETECT_COPY)
2550 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2551 if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
2553 options->detect_rename = DIFF_DETECT_COPY;
2555 else if (!strcmp(arg, "--no-renames"))
2556 options->detect_rename = 0;
2557 else if (!strcmp(arg, "--relative"))
2558 DIFF_OPT_SET(options, RELATIVE_NAME);
2559 else if (!prefixcmp(arg, "--relative=")) {
2560 DIFF_OPT_SET(options, RELATIVE_NAME);
2561 options->prefix = arg + 11;
2565 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
2566 options->xdl_opts |= XDF_IGNORE_WHITESPACE;
2567 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))
2568 options->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2569 else if (!strcmp(arg, "--ignore-space-at-eol"))
2570 options->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
2573 else if (!strcmp(arg, "--binary")) {
2574 options->output_format |= DIFF_FORMAT_PATCH;
2575 DIFF_OPT_SET(options, BINARY);
2577 else if (!strcmp(arg, "--full-index"))
2578 DIFF_OPT_SET(options, FULL_INDEX);
2579 else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
2580 DIFF_OPT_SET(options, TEXT);
2581 else if (!strcmp(arg, "-R"))
2582 DIFF_OPT_SET(options, REVERSE_DIFF);
2583 else if (!strcmp(arg, "--find-copies-harder"))
2584 DIFF_OPT_SET(options, FIND_COPIES_HARDER);
2585 else if (!strcmp(arg, "--follow"))
2586 DIFF_OPT_SET(options, FOLLOW_RENAMES);
2587 else if (!strcmp(arg, "--color"))
2588 DIFF_OPT_SET(options, COLOR_DIFF);
2589 else if (!strcmp(arg, "--no-color"))
2590 DIFF_OPT_CLR(options, COLOR_DIFF);
2591 else if (!strcmp(arg, "--color-words"))
2592 options->flags |= DIFF_OPT_COLOR_DIFF | DIFF_OPT_COLOR_DIFF_WORDS;
2593 else if (!strcmp(arg, "--exit-code"))
2594 DIFF_OPT_SET(options, EXIT_WITH_STATUS);
2595 else if (!strcmp(arg, "--quiet"))
2596 DIFF_OPT_SET(options, QUIET);
2597 else if (!strcmp(arg, "--ext-diff"))
2598 DIFF_OPT_SET(options, ALLOW_EXTERNAL);
2599 else if (!strcmp(arg, "--no-ext-diff"))
2600 DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
2601 else if (!strcmp(arg, "--ignore-submodules"))
2602 DIFF_OPT_SET(options, IGNORE_SUBMODULES);
2605 else if (!strcmp(arg, "-z"))
2606 options->line_termination = 0;
2607 else if (!prefixcmp(arg, "-l"))
2608 options->rename_limit = strtoul(arg+2, NULL, 10);
2609 else if (!prefixcmp(arg, "-S"))
2610 options->pickaxe = arg + 2;
2611 else if (!strcmp(arg, "--pickaxe-all"))
2612 options->pickaxe_opts = DIFF_PICKAXE_ALL;
2613 else if (!strcmp(arg, "--pickaxe-regex"))
2614 options->pickaxe_opts = DIFF_PICKAXE_REGEX;
2615 else if (!prefixcmp(arg, "-O"))
2616 options->orderfile = arg + 2;
2617 else if (!prefixcmp(arg, "--diff-filter="))
2618 options->filter = arg + 14;
2619 else if (!strcmp(arg, "--abbrev"))
2620 options->abbrev = DEFAULT_ABBREV;
2621 else if (!prefixcmp(arg, "--abbrev=")) {
2622 options->abbrev = strtoul(arg + 9, NULL, 10);
2623 if (options->abbrev < MINIMUM_ABBREV)
2624 options->abbrev = MINIMUM_ABBREV;
2625 else if (40 < options->abbrev)
2626 options->abbrev = 40;
2628 else if (!prefixcmp(arg, "--src-prefix="))
2629 options->a_prefix = arg + 13;
2630 else if (!prefixcmp(arg, "--dst-prefix="))
2631 options->b_prefix = arg + 13;
2632 else if (!strcmp(arg, "--no-prefix"))
2633 options->a_prefix = options->b_prefix = "";
2634 else if (!prefixcmp(arg, "--output=")) {
2635 options->file = fopen(arg + strlen("--output="), "w");
2636 options->close_file = 1;
2642 static int parse_num(const char **cp_p)
2644 unsigned long num, scale;
2646 const char *cp = *cp_p;
2653 if ( !dot && ch == '.' ) {
2656 } else if ( ch == '%' ) {
2657 scale = dot ? scale*100 : 100;
2658 cp++; /* % is always at the end */
2660 } else if ( ch >= '0' && ch <= '9' ) {
2661 if ( scale < 100000 ) {
2663 num = (num*10) + (ch-'0');
2672 /* user says num divided by scale and we say internally that
2673 * is MAX_SCORE * num / scale.
2675 return (int)((num >= scale) ? MAX_SCORE : (MAX_SCORE * num / scale));
2678 static int diff_scoreopt_parse(const char *opt)
2680 int opt1, opt2, cmd;
2685 if (cmd != 'M' && cmd != 'C' && cmd != 'B')
2686 return -1; /* that is not a -M, -C nor -B option */
2688 opt1 = parse_num(&opt);
2694 else if (*opt != '/')
2695 return -1; /* we expect -B80/99 or -B80 */
2698 opt2 = parse_num(&opt);
2703 return opt1 | (opt2 << 16);
2706 struct diff_queue_struct diff_queued_diff;
2708 void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp)
2710 if (queue->alloc <= queue->nr) {
2711 queue->alloc = alloc_nr(queue->alloc);
2712 queue->queue = xrealloc(queue->queue,
2713 sizeof(dp) * queue->alloc);
2715 queue->queue[queue->nr++] = dp;
2718 struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
2719 struct diff_filespec *one,
2720 struct diff_filespec *two)
2722 struct diff_filepair *dp = xcalloc(1, sizeof(*dp));
2730 void diff_free_filepair(struct diff_filepair *p)
2732 free_filespec(p->one);
2733 free_filespec(p->two);
2737 /* This is different from find_unique_abbrev() in that
2738 * it stuffs the result with dots for alignment.
2740 const char *diff_unique_abbrev(const unsigned char *sha1, int len)
2745 return sha1_to_hex(sha1);
2747 abbrev = find_unique_abbrev(sha1, len);
2748 abblen = strlen(abbrev);
2750 static char hex[41];
2751 if (len < abblen && abblen <= len + 2)
2752 sprintf(hex, "%s%.*s", abbrev, len+3-abblen, "..");
2754 sprintf(hex, "%s...", abbrev);
2757 return sha1_to_hex(sha1);
2760 static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt)
2762 int line_termination = opt->line_termination;
2763 int inter_name_termination = line_termination ? '\t' : '\0';
2765 if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) {
2766 fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode,
2767 diff_unique_abbrev(p->one->sha1, opt->abbrev));
2768 fprintf(opt->file, "%s ", diff_unique_abbrev(p->two->sha1, opt->abbrev));
2771 fprintf(opt->file, "%c%03d%c", p->status, similarity_index(p),
2772 inter_name_termination);
2774 fprintf(opt->file, "%c%c", p->status, inter_name_termination);
2777 if (p->status == DIFF_STATUS_COPIED ||
2778 p->status == DIFF_STATUS_RENAMED) {
2779 const char *name_a, *name_b;
2780 name_a = p->one->path;
2781 name_b = p->two->path;
2782 strip_prefix(opt->prefix_length, &name_a, &name_b);
2783 write_name_quoted(name_a, opt->file, inter_name_termination);
2784 write_name_quoted(name_b, opt->file, line_termination);
2786 const char *name_a, *name_b;
2787 name_a = p->one->mode ? p->one->path : p->two->path;
2789 strip_prefix(opt->prefix_length, &name_a, &name_b);
2790 write_name_quoted(name_a, opt->file, line_termination);
2794 int diff_unmodified_pair(struct diff_filepair *p)
2796 /* This function is written stricter than necessary to support
2797 * the currently implemented transformers, but the idea is to
2798 * let transformers to produce diff_filepairs any way they want,
2799 * and filter and clean them up here before producing the output.
2801 struct diff_filespec *one = p->one, *two = p->two;
2803 if (DIFF_PAIR_UNMERGED(p))
2804 return 0; /* unmerged is interesting */
2806 /* deletion, addition, mode or type change
2807 * and rename are all interesting.
2809 if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) ||
2810 DIFF_PAIR_MODE_CHANGED(p) ||
2811 strcmp(one->path, two->path))
2814 /* both are valid and point at the same path. that is, we are
2815 * dealing with a change.
2817 if (one->sha1_valid && two->sha1_valid &&
2818 !hashcmp(one->sha1, two->sha1))
2819 return 1; /* no change */
2820 if (!one->sha1_valid && !two->sha1_valid)
2821 return 1; /* both look at the same file on the filesystem. */
2825 static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
2827 if (diff_unmodified_pair(p))
2830 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2831 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2832 return; /* no tree diffs in patch format */
2837 static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
2838 struct diffstat_t *diffstat)
2840 if (diff_unmodified_pair(p))
2843 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2844 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2845 return; /* no tree diffs in patch format */
2847 run_diffstat(p, o, diffstat);
2850 static void diff_flush_checkdiff(struct diff_filepair *p,
2851 struct diff_options *o)
2853 if (diff_unmodified_pair(p))
2856 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
2857 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
2858 return; /* no tree diffs in patch format */
2860 run_checkdiff(p, o);
2863 int diff_queue_is_empty(void)
2865 struct diff_queue_struct *q = &diff_queued_diff;
2867 for (i = 0; i < q->nr; i++)
2868 if (!diff_unmodified_pair(q->queue[i]))
2874 void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
2876 fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n",
2879 DIFF_FILE_VALID(s) ? "valid" : "invalid",
2881 s->sha1_valid ? sha1_to_hex(s->sha1) : "");
2882 fprintf(stderr, "queue[%d] %s size %lu flags %d\n",
2884 s->size, s->xfrm_flags);
2887 void diff_debug_filepair(const struct diff_filepair *p, int i)
2889 diff_debug_filespec(p->one, i, "one");
2890 diff_debug_filespec(p->two, i, "two");
2891 fprintf(stderr, "score %d, status %c rename_used %d broken %d\n",
2892 p->score, p->status ? p->status : '?',
2893 p->one->rename_used, p->broken_pair);
2896 void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
2900 fprintf(stderr, "%s\n", msg);
2901 fprintf(stderr, "q->nr = %d\n", q->nr);
2902 for (i = 0; i < q->nr; i++) {
2903 struct diff_filepair *p = q->queue[i];
2904 diff_debug_filepair(p, i);
2909 static void diff_resolve_rename_copy(void)
2912 struct diff_filepair *p;
2913 struct diff_queue_struct *q = &diff_queued_diff;
2915 diff_debug_queue("resolve-rename-copy", q);
2917 for (i = 0; i < q->nr; i++) {
2919 p->status = 0; /* undecided */
2920 if (DIFF_PAIR_UNMERGED(p))
2921 p->status = DIFF_STATUS_UNMERGED;
2922 else if (!DIFF_FILE_VALID(p->one))
2923 p->status = DIFF_STATUS_ADDED;
2924 else if (!DIFF_FILE_VALID(p->two))
2925 p->status = DIFF_STATUS_DELETED;
2926 else if (DIFF_PAIR_TYPE_CHANGED(p))
2927 p->status = DIFF_STATUS_TYPE_CHANGED;
2929 /* from this point on, we are dealing with a pair
2930 * whose both sides are valid and of the same type, i.e.
2931 * either in-place edit or rename/copy edit.
2933 else if (DIFF_PAIR_RENAME(p)) {
2935 * A rename might have re-connected a broken
2936 * pair up, causing the pathnames to be the
2937 * same again. If so, that's not a rename at
2938 * all, just a modification..
2940 * Otherwise, see if this source was used for
2941 * multiple renames, in which case we decrement
2942 * the count, and call it a copy.
2944 if (!strcmp(p->one->path, p->two->path))
2945 p->status = DIFF_STATUS_MODIFIED;
2946 else if (--p->one->rename_used > 0)
2947 p->status = DIFF_STATUS_COPIED;
2949 p->status = DIFF_STATUS_RENAMED;
2951 else if (hashcmp(p->one->sha1, p->two->sha1) ||
2952 p->one->mode != p->two->mode ||
2953 is_null_sha1(p->one->sha1))
2954 p->status = DIFF_STATUS_MODIFIED;
2956 /* This is a "no-change" entry and should not
2957 * happen anymore, but prepare for broken callers.
2959 error("feeding unmodified %s to diffcore",
2961 p->status = DIFF_STATUS_UNKNOWN;
2964 diff_debug_queue("resolve-rename-copy done", q);
2967 static int check_pair_status(struct diff_filepair *p)
2969 switch (p->status) {
2970 case DIFF_STATUS_UNKNOWN:
2973 die("internal error in diff-resolve-rename-copy");
2979 static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
2981 int fmt = opt->output_format;
2983 if (fmt & DIFF_FORMAT_CHECKDIFF)
2984 diff_flush_checkdiff(p, opt);
2985 else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
2986 diff_flush_raw(p, opt);
2987 else if (fmt & DIFF_FORMAT_NAME) {
2988 const char *name_a, *name_b;
2989 name_a = p->two->path;
2991 strip_prefix(opt->prefix_length, &name_a, &name_b);
2992 write_name_quoted(name_a, opt->file, opt->line_termination);
2996 static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
2999 fprintf(file, " %s mode %06o ", newdelete, fs->mode);
3001 fprintf(file, " %s ", newdelete);
3002 write_name_quoted(fs->path, file, '\n');
3006 static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name)
3008 if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
3009 fprintf(file, " mode change %06o => %06o%c", p->one->mode, p->two->mode,
3010 show_name ? ' ' : '\n');
3012 write_name_quoted(p->two->path, file, '\n');
3017 static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p)
3019 char *names = pprint_rename(p->one->path, p->two->path);
3021 fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
3023 show_mode_change(file, p, 0);
3026 static void diff_summary(FILE *file, struct diff_filepair *p)
3029 case DIFF_STATUS_DELETED:
3030 show_file_mode_name(file, "delete", p->one);
3032 case DIFF_STATUS_ADDED:
3033 show_file_mode_name(file, "create", p->two);
3035 case DIFF_STATUS_COPIED:
3036 show_rename_copy(file, "copy", p);
3038 case DIFF_STATUS_RENAMED:
3039 show_rename_copy(file, "rename", p);
3043 fputs(" rewrite ", file);
3044 write_name_quoted(p->two->path, file, ' ');
3045 fprintf(file, "(%d%%)\n", similarity_index(p));
3047 show_mode_change(file, p, !p->score);
3053 struct xdiff_emit_state xm;
3058 static int remove_space(char *line, int len)
3064 for (i = 0; i < len; i++)
3065 if (!isspace((c = line[i])))
3071 static void patch_id_consume(void *priv, char *line, unsigned long len)
3073 struct patch_id_t *data = priv;
3076 /* Ignore line numbers when computing the SHA1 of the patch */
3077 if (!prefixcmp(line, "@@ -"))
3080 new_len = remove_space(line, len);
3082 SHA1_Update(data->ctx, line, new_len);
3083 data->patchlen += new_len;
3086 /* returns 0 upon success, and writes result into sha1 */
3087 static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
3089 struct diff_queue_struct *q = &diff_queued_diff;
3092 struct patch_id_t data;
3093 char buffer[PATH_MAX * 4 + 20];
3096 memset(&data, 0, sizeof(struct patch_id_t));
3098 data.xm.consume = patch_id_consume;
3100 for (i = 0; i < q->nr; i++) {
3105 struct diff_filepair *p = q->queue[i];
3108 memset(&xecfg, 0, sizeof(xecfg));
3110 return error("internal diff status error");
3111 if (p->status == DIFF_STATUS_UNKNOWN)
3113 if (diff_unmodified_pair(p))
3115 if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
3116 (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
3118 if (DIFF_PAIR_UNMERGED(p))
3121 diff_fill_sha1_info(p->one);
3122 diff_fill_sha1_info(p->two);
3123 if (fill_mmfile(&mf1, p->one) < 0 ||
3124 fill_mmfile(&mf2, p->two) < 0)
3125 return error("unable to read files to diff");
3127 len1 = remove_space(p->one->path, strlen(p->one->path));
3128 len2 = remove_space(p->two->path, strlen(p->two->path));
3129 if (p->one->mode == 0)
3130 len1 = snprintf(buffer, sizeof(buffer),
3131 "diff--gita/%.*sb/%.*s"
3138 len2, p->two->path);
3139 else if (p->two->mode == 0)
3140 len1 = snprintf(buffer, sizeof(buffer),
3141 "diff--gita/%.*sb/%.*s"
3142 "deletedfilemode%06o"
3148 len1, p->one->path);
3150 len1 = snprintf(buffer, sizeof(buffer),
3151 "diff--gita/%.*sb/%.*s"
3157 len2, p->two->path);
3158 SHA1_Update(&ctx, buffer, len1);
3160 xpp.flags = XDF_NEED_MINIMAL;
3162 xecfg.flags = XDL_EMIT_FUNCNAMES;
3163 ecb.outf = xdiff_outf;
3165 xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
3168 SHA1_Final(sha1, &ctx);
3172 int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1)
3174 struct diff_queue_struct *q = &diff_queued_diff;
3176 int result = diff_get_patch_id(options, sha1);
3178 for (i = 0; i < q->nr; i++)
3179 diff_free_filepair(q->queue[i]);
3183 q->nr = q->alloc = 0;
3188 static int is_summary_empty(const struct diff_queue_struct *q)
3192 for (i = 0; i < q->nr; i++) {
3193 const struct diff_filepair *p = q->queue[i];
3195 switch (p->status) {
3196 case DIFF_STATUS_DELETED:
3197 case DIFF_STATUS_ADDED:
3198 case DIFF_STATUS_COPIED:
3199 case DIFF_STATUS_RENAMED:
3204 if (p->one->mode && p->two->mode &&
3205 p->one->mode != p->two->mode)
3213 void diff_flush(struct diff_options *options)
3215 struct diff_queue_struct *q = &diff_queued_diff;
3216 int i, output_format = options->output_format;
3220 * Order: raw, stat, summary, patch
3221 * or: name/name-status/checkdiff (other bits clear)
3226 if (output_format & (DIFF_FORMAT_RAW |
3228 DIFF_FORMAT_NAME_STATUS |
3229 DIFF_FORMAT_CHECKDIFF)) {
3230 for (i = 0; i < q->nr; i++) {
3231 struct diff_filepair *p = q->queue[i];
3232 if (check_pair_status(p))
3233 flush_one_pair(p, options);
3238 if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT)) {
3239 struct diffstat_t diffstat;
3241 memset(&diffstat, 0, sizeof(struct diffstat_t));
3242 diffstat.xm.consume = diffstat_consume;
3243 for (i = 0; i < q->nr; i++) {
3244 struct diff_filepair *p = q->queue[i];
3245 if (check_pair_status(p))
3246 diff_flush_stat(p, options, &diffstat);
3248 if (output_format & DIFF_FORMAT_NUMSTAT)
3249 show_numstat(&diffstat, options);
3250 if (output_format & DIFF_FORMAT_DIFFSTAT)
3251 show_stats(&diffstat, options);
3252 if (output_format & DIFF_FORMAT_SHORTSTAT)
3253 show_shortstats(&diffstat, options);
3254 free_diffstat_info(&diffstat);
3257 if (output_format & DIFF_FORMAT_DIRSTAT)
3258 show_dirstat(options);
3260 if (output_format & DIFF_FORMAT_SUMMARY && !is_summary_empty(q)) {
3261 for (i = 0; i < q->nr; i++)
3262 diff_summary(options->file, q->queue[i]);
3266 if (output_format & DIFF_FORMAT_PATCH) {
3268 putc(options->line_termination, options->file);
3269 if (options->stat_sep) {
3270 /* attach patch instead of inline */
3271 fputs(options->stat_sep, options->file);
3275 for (i = 0; i < q->nr; i++) {
3276 struct diff_filepair *p = q->queue[i];
3277 if (check_pair_status(p))
3278 diff_flush_patch(p, options);
3282 if (output_format & DIFF_FORMAT_CALLBACK)
3283 options->format_callback(q, options, options->format_callback_data);
3285 for (i = 0; i < q->nr; i++)
3286 diff_free_filepair(q->queue[i]);
3290 q->nr = q->alloc = 0;
3291 if (options->close_file)
3292 fclose(options->file);
3295 static void diffcore_apply_filter(const char *filter)
3298 struct diff_queue_struct *q = &diff_queued_diff;
3299 struct diff_queue_struct outq;
3301 outq.nr = outq.alloc = 0;
3306 if (strchr(filter, DIFF_STATUS_FILTER_AON)) {
3308 for (i = found = 0; !found && i < q->nr; i++) {
3309 struct diff_filepair *p = q->queue[i];
3310 if (((p->status == DIFF_STATUS_MODIFIED) &&
3312 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3314 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3315 ((p->status != DIFF_STATUS_MODIFIED) &&
3316 strchr(filter, p->status)))
3322 /* otherwise we will clear the whole queue
3323 * by copying the empty outq at the end of this
3324 * function, but first clear the current entries
3327 for (i = 0; i < q->nr; i++)
3328 diff_free_filepair(q->queue[i]);
3331 /* Only the matching ones */
3332 for (i = 0; i < q->nr; i++) {
3333 struct diff_filepair *p = q->queue[i];
3335 if (((p->status == DIFF_STATUS_MODIFIED) &&
3337 strchr(filter, DIFF_STATUS_FILTER_BROKEN)) ||
3339 strchr(filter, DIFF_STATUS_MODIFIED)))) ||
3340 ((p->status != DIFF_STATUS_MODIFIED) &&
3341 strchr(filter, p->status)))
3344 diff_free_filepair(p);
3351 /* Check whether two filespecs with the same mode and size are identical */
3352 static int diff_filespec_is_identical(struct diff_filespec *one,
3353 struct diff_filespec *two)
3355 if (S_ISGITLINK(one->mode))
3357 if (diff_populate_filespec(one, 0))
3359 if (diff_populate_filespec(two, 0))
3361 return !memcmp(one->data, two->data, one->size);
3364 static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3367 struct diff_queue_struct *q = &diff_queued_diff;
3368 struct diff_queue_struct outq;
3370 outq.nr = outq.alloc = 0;
3372 for (i = 0; i < q->nr; i++) {
3373 struct diff_filepair *p = q->queue[i];
3376 * 1. Entries that come from stat info dirtyness
3377 * always have both sides (iow, not create/delete),
3378 * one side of the object name is unknown, with
3379 * the same mode and size. Keep the ones that
3380 * do not match these criteria. They have real
3383 * 2. At this point, the file is known to be modified,
3384 * with the same mode and size, and the object
3385 * name of one side is unknown. Need to inspect
3386 * the identical contents.
3388 if (!DIFF_FILE_VALID(p->one) || /* (1) */
3389 !DIFF_FILE_VALID(p->two) ||
3390 (p->one->sha1_valid && p->two->sha1_valid) ||
3391 (p->one->mode != p->two->mode) ||
3392 diff_populate_filespec(p->one, 1) ||
3393 diff_populate_filespec(p->two, 1) ||
3394 (p->one->size != p->two->size) ||
3395 !diff_filespec_is_identical(p->one, p->two)) /* (2) */
3399 * The caller can subtract 1 from skip_stat_unmatch
3400 * to determine how many paths were dirty only
3401 * due to stat info mismatch.
3403 if (!DIFF_OPT_TST(diffopt, NO_INDEX))
3404 diffopt->skip_stat_unmatch++;
3405 diff_free_filepair(p);
3412 void diffcore_std(struct diff_options *options)
3414 if (options->skip_stat_unmatch)
3415 diffcore_skip_stat_unmatch(options);
3416 if (options->break_opt != -1)
3417 diffcore_break(options->break_opt);
3418 if (options->detect_rename)
3419 diffcore_rename(options);
3420 if (options->break_opt != -1)
3421 diffcore_merge_broken();
3422 if (options->pickaxe)
3423 diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
3424 if (options->orderfile)
3425 diffcore_order(options->orderfile);
3426 diff_resolve_rename_copy();
3427 diffcore_apply_filter(options->filter);
3429 if (diff_queued_diff.nr)
3430 DIFF_OPT_SET(options, HAS_CHANGES);
3432 DIFF_OPT_CLR(options, HAS_CHANGES);
3435 int diff_result_code(struct diff_options *opt, int status)
3438 if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3439 !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
3441 if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
3442 DIFF_OPT_TST(opt, HAS_CHANGES))
3444 if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
3445 DIFF_OPT_TST(opt, CHECK_FAILED))
3450 void diff_addremove(struct diff_options *options,
3451 int addremove, unsigned mode,
3452 const unsigned char *sha1,
3453 const char *concatpath)
3455 struct diff_filespec *one, *two;
3457 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(mode))
3460 /* This may look odd, but it is a preparation for
3461 * feeding "there are unchanged files which should
3462 * not produce diffs, but when you are doing copy
3463 * detection you would need them, so here they are"
3464 * entries to the diff-core. They will be prefixed
3465 * with something like '=' or '*' (I haven't decided
3466 * which but should not make any difference).
3467 * Feeding the same new and old to diff_change()
3468 * also has the same effect.
3469 * Before the final output happens, they are pruned after
3470 * merged into rename/copy pairs as appropriate.
3472 if (DIFF_OPT_TST(options, REVERSE_DIFF))
3473 addremove = (addremove == '+' ? '-' :
3474 addremove == '-' ? '+' : addremove);
3476 if (options->prefix &&
3477 strncmp(concatpath, options->prefix, options->prefix_length))
3480 one = alloc_filespec(concatpath);
3481 two = alloc_filespec(concatpath);
3483 if (addremove != '+')
3484 fill_filespec(one, sha1, mode);
3485 if (addremove != '-')
3486 fill_filespec(two, sha1, mode);
3488 diff_queue(&diff_queued_diff, one, two);
3489 DIFF_OPT_SET(options, HAS_CHANGES);
3492 void diff_change(struct diff_options *options,
3493 unsigned old_mode, unsigned new_mode,
3494 const unsigned char *old_sha1,
3495 const unsigned char *new_sha1,
3496 const char *concatpath)
3498 struct diff_filespec *one, *two;
3500 if (DIFF_OPT_TST(options, IGNORE_SUBMODULES) && S_ISGITLINK(old_mode)
3501 && S_ISGITLINK(new_mode))
3504 if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
3506 const unsigned char *tmp_c;
3507 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
3508 tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c;
3511 if (options->prefix &&
3512 strncmp(concatpath, options->prefix, options->prefix_length))
3515 one = alloc_filespec(concatpath);
3516 two = alloc_filespec(concatpath);
3517 fill_filespec(one, old_sha1, old_mode);
3518 fill_filespec(two, new_sha1, new_mode);
3520 diff_queue(&diff_queued_diff, one, two);
3521 DIFF_OPT_SET(options, HAS_CHANGES);
3524 void diff_unmerge(struct diff_options *options,
3526 unsigned mode, const unsigned char *sha1)
3528 struct diff_filespec *one, *two;
3530 if (options->prefix &&
3531 strncmp(path, options->prefix, options->prefix_length))
3534 one = alloc_filespec(path);
3535 two = alloc_filespec(path);
3536 fill_filespec(one, sha1, mode);
3537 diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1;