threads / patch / 6716

patchfast-import: in_merge_bases() has a different signature now

Subject: [PATCH for 'next'] fast-import: in_merge_bases() has a different signature now

## tl;dr

3 messages between Feb 7, 2007 and Feb 7, 2007. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Johannes Schindelin· Feb 7, 2007, 11:37 UTC · lore

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@gmx.de>
---

	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(-)

Show changes to fast-import.c +1 −1

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· Feb 7, 2007, 11:42 UTC · re: Johannes Schindelin · lore

Re: [PATCH for 'next'] fast-import: in_merge_bases() has a different signature now

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· Feb 7, 2007, 21:05 UTC · re: Johannes Schindelin · lore

Re: [PATCH for 'next'] fast-import: in_merge_bases() has a different signature now

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 9 quoted lines

> 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@gmx.de>
> ---
>
> 	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.