{"thread":{"id":"6716","subject":"[PATCH for 'next'] fast-import: in_merge_bases() has a different signature now","startedAt":"2007-02-07T11:37:32Z","lastAt":"2007-02-07T21:05:27Z","messageCount":3,"participants":["Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"33794","messageId":"Pine.LNX.4.63.0702071235370.22628@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6716","inReplyTo":null,"subject":"[PATCH for 'next'] fast-import: in_merge_bases() has a different signature now","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-02-07T11:37:32Z","receivedAt":"2007-02-07T11:37:32Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nThe function in_merge_bases() can take more than one reference now,\nand therefore we need to call it differently.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n\n\tYes, yes, I know. BAD Dscho. Still not using master. Maybe \n\ttomorrow I will find the time to rebase my changes on top of\n\tnext to master. That will be my first experience with git-rebase!\n\n fast-import.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/fast-import.c b/fast-import.c\nindex c72c5c7..bc95a0d 100644\n--- a/fast-import.c\n+++ b/fast-import.c\n@@ -1302,7 +1302,7 @@ static int update_branch(struct branch *b)\n \t\t\treturn error(\"Branch %s is missing commits.\", b->name);\n \t\t}\n \n-\t\tif (!in_merge_bases(old_cmit, new_cmit)) {\n+\t\tif (!in_merge_bases(old_cmit, &new_cmit, 1)) {\n \t\t\tunlock_ref(lock);\n \t\t\twarn(\"Not updating %s\"\n \t\t\t\t\" (new tip %s does not contain %s)\",\n-- \n1.5.0.rc3.2124.g3861-dirty\n"},{"id":"33796","messageId":"Pine.LNX.4.63.0702071241200.22628@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6716","inReplyTo":"Pine.LNX.4.63.0702071235370.22628@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH for 'next'] fast-import: in_merge_bases() has a different signature now","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-02-07T11:42:38Z","receivedAt":"2007-02-07T11:42:38Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOoops. I just realized that I merged 'master' into 'next'. Shawn, or \nJunio, when you actually do that merge, you might want to pick up this \npatch, too.\n\nCiao,\nDscho\n"},{"id":"33848","messageId":"7vtzxx65m0.fsf@assigned-by-dhcp.cox.net","threadId":"6716","inReplyTo":"Pine.LNX.4.63.0702071235370.22628@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH for 'next'] fast-import: in_merge_bases() has a different signature now","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-02-07T21:05:27Z","receivedAt":"2007-02-07T21:05:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> The function in_merge_bases() can take more than one reference now,\n> and therefore we need to call it differently.\n>\n> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n> ---\n>\n> \tYes, yes, I know. BAD Dscho. Still not using master. Maybe \n> \ttomorrow I will find the time to rebase my changes on top of\n> \tnext to master. That will be my first experience with git-rebase!\n\nThanks for a heads-up.\n\nIt _might_ be worth merging the in_merge_bases() from 'next' to\n'master', either up to 03840fc3 or all the way to dc3806d3.\n\nBut I'd resist the temptation for now.\n"}]}