aboutsummaryrefslogtreecommitdiff
path: root/builtin-reflog.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-08 23:22:31 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-09 17:57:03 -0800
commit03840fc32d783be6750bf7e41a89687b8c3053eb (patch)
tree8653bc787e3eee04d2fad107b32c1fe12e7fe05f /builtin-reflog.c
parent71dfbf224ff980f4085f75868dc409118418731e (diff)
downloadgit-03840fc32d783be6750bf7e41a89687b8c3053eb.tar.gz
git-03840fc32d783be6750bf7e41a89687b8c3053eb.tar.xz
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>
Diffstat (limited to 'builtin-reflog.c')
-rw-r--r--builtin-reflog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-reflog.c b/builtin-reflog.c
index a96711766..fb37984ae 100644
--- a/builtin-reflog.c
+++ b/builtin-reflog.c
@@ -217,8 +217,8 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
if ((timestamp < cb->cmd->expire_unreachable) &&
(!cb->ref_commit ||
- (old && !in_merge_bases(old, cb->ref_commit)) ||
- (new && !in_merge_bases(new, cb->ref_commit))))
+ (old && !in_merge_bases(old, &cb->ref_commit, 1)) ||
+ (new && !in_merge_bases(new, &cb->ref_commit, 1))))
goto prune;
if (cb->newlog)