The function in_merge_bases() can take more than one reference now,
and therefore we need to call it differently.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
Yes, yes, I know. BAD Dscho. Still not using master. Maybe
tomorrow I will find the time to rebase my changes on top of
next to master. That will be my first experience with git-rebase!
fast-import.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index c72c5c7..bc95a0d 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1302,7 +1302,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)) {
+ if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
unlock_ref(lock);
warn("Not updating %s"
" (new tip %s does not contain %s)",
--
1.5.0.rc3.2124.g3861-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html