[PATCH] make file merging respect permissions

diff --git a/commit.c b/commit.c
index 911f6435a74b93f6d25c6852d1814fa8dbaf626e..2502688262819033f5b8ed60a7bef5eed0aa2d6a 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -114,7 +114,8 @@ void sort_by_date(struct commit_list **list)
        *list = ret;
 }
 
-struct commit *pop_most_recent_commit(struct commit_list **list)
+struct commit *pop_most_recent_commit(struct commit_list **list,
+                                     unsigned int mark)
 {
        struct commit *ret = (*list)->item;
        struct commit_list *parents = ret->parents;
@@ -124,8 +125,12 @@ struct commit *pop_most_recent_commit(struct commit_list **list)
        free(old);
 
        while (parents) {
-               parse_commit(parents->item);
-               insert_by_date(list, parents->item);
+               struct commit *commit = parents->item;
+               parse_commit(commit);
+               if (!(commit->object.flags & mark)) {
+                       commit->object.flags |= mark;
+                       insert_by_date(list, commit);
+               }
                parents = parents->next;
        }
        return ret;