summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-27 21:46:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-28 01:36:39 (GMT)
commita20efee9cfcf9c68bb01d0aa82ffc7903d88bab4 (patch)
treee329f429d9abd42f015099a072efedcfd385ec46 /fast-import.c
parentd0f1ea6003d97e63110fa7d50bb07f546a909b6e (diff)
downloadgit-a20efee9cfcf9c68bb01d0aa82ffc7903d88bab4.zip
git-a20efee9cfcf9c68bb01d0aa82ffc7903d88bab4.tar.gz
git-a20efee9cfcf9c68bb01d0aa82ffc7903d88bab4.tar.bz2
in_merge_bases(): support only one "other" commit
In early days of its life, I planned to make it possible to compute "is a commit contained in all of these other commits?" with this function, but it turned out that no caller needed it. Just make it take two commit objects and add a comment to say what these two functions do. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c
index a85275d..e6f61fc 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1691,7 +1691,7 @@ static int update_branch(struct branch *b)
return error("Branch %s is missing commits.", b->name);
}
- if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
+ if (!in_merge_bases(old_cmit, new_cmit)) {
unlock_ref(lock);
warning("Not updating %s"
" (new tip %s does not contain %s)",