Add get_merge_bases_clean()
Add get_merge_bases_clean(), a wrapper for get_merge_bases() that cleans up after doing its work and make get_merge_bases() NOT clean up. Single-shot programs like git-merge-base can use the dirty and fast version. Also move the object flags used in get_merge_bases() out of the range defined in revision.h. This fixes the "66ae0c77...ced9456a 89719209...262a6ef7" test of the ... operator which is introduced with the next patch. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
Rene Scharfe committed
Jul 2, 2006 at 01:29 UTC
31609c17251f368584f7b94d44b06194112b4251
2 files changed
+17
-4
commit.c
+16
-4
@@ -849,9 +849,10 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
849
850
/* merge-rebase stuff */
851
852
-#define PARENT1 1
853
-#define PARENT2 2
854
-#define UNINTERESTING 4
852
+/* bits #0..7 in revision.h */
853
+#define PARENT1 (1u<< 8)
854
+#define PARENT2 (1u<< 9)
855
+#define UNINTERESTING (1u<<10)
856
857
static struct commit *interesting(struct commit_list *list)
858
{
@@ -1080,9 +1081,20 @@ struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2)
1081
tmp = next;
1082
}
1083
1083
- /* reset flags */
1084
+ return result;
1085
+}
1086
+
1087
+struct commit_list *get_merge_bases_clean(struct commit *rev1,
1088
+ struct commit *rev2)
1089
+{
1090
+ unsigned int flags1 = rev1->object.flags;
1091
+ unsigned int flags2 = rev2->object.flags;
1092
+ struct commit_list *result = get_merge_bases(rev1, rev2);
1093
+
1094
clear_commit_marks(rev1, PARENT1 | PARENT2 | UNINTERESTING);
1095
clear_commit_marks(rev2, PARENT1 | PARENT2 | UNINTERESTING);
1096
+ rev1->object.flags = flags1;
1097
+ rev2->object.flags = flags2;
1098
1099
return result;
1100
}
commit.h
+1
@@ -106,5 +106,6 @@ int register_commit_graft(struct commit_graft *, int);
106
int read_graft_file(const char *graft_file);
107
108
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
109
+extern struct commit_list *get_merge_bases_clean(struct commit *rev1, struct commit *rev2);
110
111
#endif /* COMMIT_H */