summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-09 02:03:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-09 06:18:08 (GMT)
commit11d6596709e04b8d2b429f230b2ed570d013f812 (patch)
tree2bd7e645b9b3e6b5db4c8cfe82e35651730ee165 /revision.c
parentae7aa49914072b9007ba62245e68b8bbd24f964a (diff)
downloadgit-11d6596709e04b8d2b429f230b2ed570d013f812.zip
git-11d6596709e04b8d2b429f230b2ed570d013f812.tar.gz
git-11d6596709e04b8d2b429f230b2ed570d013f812.tar.bz2
revision.c: remove duplicated parents after history simplification
When we simplify history due to path limits, the parents list for a rewritten commit can end up having duplicates. Instead of filtering them out in the output codepath like earlier commit 88494423 did, remove them much earlier, when the parent information actually gets rewritten. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 5184716..33ee9ee 100644
--- a/revision.c
+++ b/revision.c
@@ -1308,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;
@@ -1324,6 +1343,7 @@ static int rewrite_parents(struct rev_info *revs, struct commit *commit)
}
pp = &parent->next;
}
+ remove_duplicate_parents(commit);
return 0;
}