revision.c: remove duplicated parents after history simplification

diff --git a/revision.c b/revision.c
index 1f4590b89649a9d1397af2f35af142cc6ab36847..33ee9ee3b2ad98f9d02f350c649a9af1bf2aff0f 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -667,7 +667,6 @@ void init_revisions(struct rev_info *revs, const char *prefix)
        revs->min_age = -1;
        revs->skip_count = -1;
        revs->max_count = -1;
-       revs->subject_prefix = "PATCH";
 
        revs->prune_fn = NULL;
        revs->prune_data = NULL;
@@ -1230,7 +1229,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 
        if (revs->prune_data) {
                diff_tree_setup_paths(revs->prune_data, &revs->pruning);
-               revs->prune_fn = try_to_simplify_commit;
+               /* Can't prune commits with rename following: the paths change.. */
+               if (!revs->diffopt.follow_renames)
+                       revs->prune_fn = try_to_simplify_commit;
                if (!revs->full_diff)
                        diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
        }
@@ -1307,6 +1308,25 @@ static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp
        }
 }
 
+static void remove_duplicate_parents(struct commit *commit)
+{
+       struct commit_list *p;
+       struct commit_list **pp = &commit->parents;
+
+       /* Examine existing parents while marking ones we have seen... */
+       for (p = commit->parents; p; p = p->next) {
+               struct commit *parent = p->item;
+               if (parent->object.flags & TMP_MARK)
+                       continue;
+               parent->object.flags |= TMP_MARK;
+               *pp = p;
+               pp = &p->next;
+       }
+       /* ... and clear the temporary mark */
+       for (p = commit->parents; p; p = p->next)
+               p->item->object.flags &= ~TMP_MARK;
+}
+
 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
 {
        struct commit_list **pp = &commit->parents;
@@ -1323,6 +1343,7 @@ static int rewrite_parents(struct rev_info *revs, struct commit *commit)
                }
                pp = &parent->next;
        }
+       remove_duplicate_parents(commit);
        return 0;
 }