@matheusbsbs / matheus-bagliano / commits / 03840fc32d
Fork 0

Allow in_merge_bases() to take more than one reference commits.

The internal function in_merge_bases(A, B) is used to make sure that commit A is an ancestor of commit B. This changes the signature of it to take an array of B's and updates its current callers. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jan 8, 2007 at 23:22 UTC 03840fc32d783be6750bf7e41a89687b8c3053eb
4 files changed +10 -7
builtin-branch.c
+1 -1
@@ -134,7 +134,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
134 */
135
136 if (!force &&
137 - !in_merge_bases(rev, head_rev)) {
137 + !in_merge_bases(rev, &head_rev, 1)) {
138 error("The branch '%s' is not a strict subset of "
139 "your current HEAD.\n"
140 "If you are sure you want to delete it, "
builtin-reflog.c
+2 -2
@@ -217,8 +217,8 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
217
218 if ((timestamp < cb->cmd->expire_unreachable) &&
219 (!cb->ref_commit ||
220 - (old && !in_merge_bases(old, cb->ref_commit)) ||
221 - (new && !in_merge_bases(new, cb->ref_commit))))
220 + (old && !in_merge_bases(old, &cb->ref_commit, 1)) ||
221 + (new && !in_merge_bases(new, &cb->ref_commit, 1))))
222 goto prune;
223
224 if (cb->newlog)
commit.c
+6 -3
@@ -1158,14 +1158,17 @@ struct commit_list *get_merge_bases(struct commit *one,
1158 return result;
1159 }
1160
1161 -int in_merge_bases(struct commit *rev1, struct commit *rev2)
1161 +int in_merge_bases(struct commit *commit, struct commit **reference, int num)
1162 {
1163 struct commit_list *bases, *b;
1164 int ret = 0;
1165
1166 - bases = get_merge_bases(rev1, rev2, 1);
1166 + if (num == 1)
1167 + bases = get_merge_bases(commit, *reference, 1);
1168 + else
1169 + die("not yet");
1170 for (b = bases; b; b = b->next) {
1168 - if (!hashcmp(rev1->object.sha1, b->item->object.sha1)) {
1171 + if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
1172 ret = 1;
1173 break;
1174 }
commit.h
+1 -1
@@ -114,5 +114,5 @@ extern int is_repository_shallow();
114 extern struct commit_list *get_shallow_commits(struct object_array *heads,
115 int depth, int shallow_flag, int not_shallow_flag);
116
117 -int in_merge_bases(struct commit *rev1, struct commit *rev2);
117 +int in_merge_bases(struct commit *, struct commit **, int);
118 #endif /* COMMIT_H */