cvsserver: fix checkouts with -d <somedir>

diff --git a/diff-files.c b/diff-files.c
index 4a30c56f8471c4a816e989dfb63ea66db93c8b3f..b1c05b325a8f171fc67c204471db2cb5e98b0b50 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);
@@ -119,15 +118,19 @@ int main(int argc, const char **argv)
                if (ce_stage(ce)) {
                        struct {
                                struct combine_diff_path p;
-                               unsigned char fill[4][20];
+                               struct combine_diff_parent filler[5];
                        } combine;
+                       int num_compare_stages = 0;
 
                        combine.p.next = NULL;
                        combine.p.len = ce_namelen(ce);
                        combine.p.path = xmalloc(combine.p.len + 1);
                        memcpy(combine.p.path, ce->name, combine.p.len);
                        combine.p.path[combine.p.len] = 0;
-                       memset(combine.p.sha1, 0, 100);
+                       combine.p.mode = 0;
+                       memset(combine.p.sha1, 0, 20);
+                       memset(&combine.p.parent[0], 0,
+                              sizeof(combine.filler));
 
                        while (i < entries) {
                                struct cache_entry *nce = active_cache[i];
@@ -140,9 +143,16 @@ int main(int argc, const char **argv)
                                 * stage #3 (theirs) is the second.
                                 */
                                stage = ce_stage(nce);
-                               if (2 <= stage)
-                                       memcpy(combine.p.parent_sha1[stage-2],
+                               if (2 <= stage) {
+                                       int mode = ntohl(nce->ce_mode);
+                                       num_compare_stages++;
+                                       memcpy(combine.p.parent[stage-2].sha1,
                                               nce->sha1, 20);
+                                       combine.p.parent[stage-2].mode =
+                                               DIFF_FILE_CANON_MODE(mode);
+                                       combine.p.parent[stage-2].status =
+                                               DIFF_STATUS_MODIFIED;
+                               }
 
                                /* diff against the proper unmerged stage */
                                if (stage == diff_unmerged_stage)
@@ -154,12 +164,15 @@ int main(int argc, const char **argv)
                         */
                        i--;
 
-                       if (combine_merges) {
+                       if (combine_merges && num_compare_stages == 2) {
                                show_combined_diff(&combine.p, 2,
                                                   dense_combined_merges,
-                                                  NULL, 0);
+                                                  NULL,
+                                                  &diff_options);
+                               free(combine.p.path);
                                continue;
                        }
+                       free(combine.p.path);
 
                        /*
                         * Show the diff for the 'ce' if we found the one
@@ -180,7 +193,7 @@ int main(int argc, const char **argv)
                        show_file('-', ce);
                        continue;
                }
-               changed = ce_match_stat(ce, &st);
+               changed = ce_match_stat(ce, &st, 0);
                if (!changed && !diff_options.find_copies_harder)
                        continue;
                oldmode = ntohl(ce->ce_mode);