# [PATCH for 'next'] fast-import: in_merge_bases() has a different signature now 3 messages from 2007-02-07 to 2007-02-07. Participants: Johannes Schindelin, Junio C Hamano. Thread: https://gitlist.dev/t/6716 ## Johannes Schindelin, 2007-02-07 11:37 Subject: [PATCH for 'next'] fast-import: in_merge_bases() has a different signature now Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.63.0702071235370.22628%40wbgn013.biozentrum.uni-wuerzburg.de ``` 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 --- 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 ``` ## Johannes Schindelin, 2007-02-07 11:42 Subject: Re: [PATCH for 'next'] fast-import: in_merge_bases() has a different signature now Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.63.0702071241200.22628%40wbgn013.biozentrum.uni-wuerzburg.de In-Reply-To: ``` Hi, Ooops. I just realized that I merged 'master' into 'next'. Shawn, or Junio, when you actually do that merge, you might want to pick up this patch, too. Ciao, Dscho ``` ## Junio C Hamano, 2007-02-07 21:05 Subject: Re: [PATCH for 'next'] fast-import: in_merge_bases() has a different signature now Message-ID: <7vtzxx65m0.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vtzxx65m0.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` Johannes Schindelin writes: > 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 > --- > > 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! Thanks for a heads-up. It _might_ be worth merging the in_merge_bases() from 'next' to 'master', either up to 03840fc3 or all the way to dc3806d3. But I'd resist the temptation for now. ```