remote-mediawiki tests: use test_cmp in tests

[thirdparty/git.git] / diff.c

diff --git a/diff.c b/diff.c
index f9709de7b4540d1ddf7dda7bbb38a54bbbb8d952..a5114fa86468ceff56005ed83fcb10f129dc0fc2 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3153,16 +3153,19 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
        gather_dirstat(options, &dir, changed, "", 0);
 }
 
+static void free_diffstat_file(struct diffstat_file *f)
+{
+       free(f->print_name);
+       free(f->name);
+       free(f->from_name);
+       free(f);
+}
+
 void free_diffstat_info(struct diffstat_t *diffstat)
 {
        int i;
-       for (i = 0; i < diffstat->nr; i++) {
-               struct diffstat_file *f = diffstat->files[i];
-               free(f->print_name);
-               free(f->name);
-               free(f->from_name);
-               free(f);
-       }
+       for (i = 0; i < diffstat->nr; i++)
+               free_diffstat_file(diffstat->files[i]);
        free(diffstat->files);
 }
 
@@ -3429,7 +3432,7 @@ static void builtin_diff(const char *name_a,
        if (o->submodule_format == DIFF_SUBMODULE_LOG &&
            (!one->mode || S_ISGITLINK(one->mode)) &&
            (!two->mode || S_ISGITLINK(two->mode))) {
-               show_submodule_summary(o, one->path ? one->path : two->path,
+               show_submodule_diff_summary(o, one->path ? one->path : two->path,
                                &one->oid, &two->oid,
                                two->dirty_submodule);
                return;
@@ -3718,6 +3721,27 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
                if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line,
                                  diffstat_consume, diffstat, &xpp, &xecfg))
                        die("unable to generate diffstat for %s", one->path);
+
+               if (DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two)) {
+                       struct diffstat_file *file =
+                               diffstat->files[diffstat->nr - 1];
+                       /*
+                        * Omit diffstats of modified files where nothing changed.
+                        * Even if !same_contents, this might be the case due to
+                        * ignoring whitespace changes, etc.
+                        *
+                        * But note that we special-case additions, deletions,
+                        * renames, and mode changes as adding an empty file,
+                        * for example is still of interest.
+                        */
+                       if ((p->status == DIFF_STATUS_MODIFIED)
+                               && !file->added
+                               && !file->deleted
+                               && one->mode == two->mode) {
+                               free_diffstat_file(file);
+                               diffstat->nr--;
+                       }
+               }
        }
 
        diff_free_filespec_data(one);
@@ -4319,7 +4343,10 @@ static void fill_metainfo(struct strbuf *msg,
        }
        if (one && two && !oideq(&one->oid, &two->oid)) {
                const unsigned hexsz = the_hash_algo->hexsz;
-               int abbrev = o->flags.full_index ? hexsz : DEFAULT_ABBREV;
+               int abbrev = o->abbrev ? o->abbrev : DEFAULT_ABBREV;
+
+               if (o->flags.full_index)
+                       abbrev = hexsz;
 
                if (o->flags.binary) {
                        mmfile_t mf;
@@ -6044,6 +6071,8 @@ static void patch_id_consume(void *priv, char *line, unsigned long len)
        struct patch_id_t *data = priv;
        int new_len;
 
+       if (len > 12 && starts_with(line, "\\ "))
+               return;
        new_len = remove_space(line, len);
 
        the_hash_algo->update_fn(data->ctx, line, new_len);