Retire git-log.sh (take #4)

diff --git a/diff-files.c b/diff-files.c
index c96ad35fb6cdb74494d1fdd93e1f125412ee024c..3e7f5f105b19fd47fd8b3716617592ec2a60da47 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -88,9 +88,8 @@ int main(int argc, const char **argv)
                }
                argv++; argc--;
        }
-       if (combine_merges) {
+       if (dense_combined_merges)
                diff_options.output_format = DIFF_FORMAT_PATCH;
-       }
 
        /* Find the directory, and set up the pathspec */
        pathspec = get_pathspec(prefix, argv + 1);
@@ -150,7 +149,9 @@ int main(int argc, const char **argv)
                                        memcpy(combine.p.parent[stage-2].sha1,
                                               nce->sha1, 20);
                                        combine.p.parent[stage-2].mode =
-                                               DIFF_FILE_CANON_MODE(mode);
+                                               canon_mode(mode);
+                                       combine.p.parent[stage-2].status =
+                                               DIFF_STATUS_MODIFIED;
                                }
 
                                /* diff against the proper unmerged stage */
@@ -166,7 +167,8 @@ int main(int argc, const char **argv)
                        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;
                        }
@@ -196,7 +198,7 @@ int main(int argc, const char **argv)
                        continue;
                oldmode = ntohl(ce->ce_mode);
 
-               newmode = DIFF_FILE_CANON_MODE(st.st_mode);
+               newmode = canon_mode(st.st_mode);
                if (!trust_executable_bit &&
                    S_ISREG(newmode) && S_ISREG(oldmode) &&
                    ((newmode ^ oldmode) == 0111))