Home » Mailing list archives » git » 2008 » June » 9

Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Junio C Hamano <gitster@...>
To: Johannes Schindelin <Johannes.Schindelin@...>
Cc: Miklos Vajna <vmiklos@...>, <git@...>
Subject: Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c
Date: Monday, June 9, 2008 - 7:41 pm

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


Actually a quick glance at git-merge, a rather large case...esac after
that "show-branch --merge-base" tells me that we do not really use the
output from that operation and instead we check if we are fast-forward
from all the other heads by iterating over them.  merge-octupos would
accept it as the base but never looks at it.

So I think with a proper refactoring of the codepath you probably would
not even have to do the blanket "merge-base across all heads" at all.



--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 08/10] Introduce commit_list_append() in commit.c, Miklos Vajna, (Thu Jun 5, 4:44 pm)
Re: [PATCH 08/10] Introduce commit_list_append() in commit.c, Junio C Hamano, (Thu Jun 5, 7:16 pm)
Re: [PATCH 08/10] Introduce commit_list_append() in commit.c, Miklos Vajna, (Fri Jun 6, 7:52 pm)
Re: [PATCH 08/10] Introduce commit_list_append() in commit.c, Junio C Hamano, (Fri Jun 6, 8:14 pm)
Re: [PATCH 08/10] Introduce commit_list_append() in commit.c, Miklos Vajna, (Fri Jun 6, 10:03 pm)
[PATCH 09/10] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Thu Jun 5, 4:44 pm)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in com..., Junio C Hamano, (Thu Jun 5, 11:51 pm)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in com..., Miklos Vajna, (Fri Jun 6, 10:30 pm)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in com..., Johannes Schindelin, (Fri Jun 6, 8:30 am)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in com..., Junio C Hamano, (Fri Jun 6, 1:53 am)
[PATCH] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Sat Jun 7, 5:38 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Johannes Schindelin, (Mon Jun 9, 10:02 am)
[PATCH] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Mon Jun 9, 6:43 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Junio C Hamano, (Mon Jun 9, 7:06 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Johannes Schindelin, (Mon Jun 9, 7:31 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Junio C Hamano, (Mon Jun 9, 7:41 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Mon Jun 9, 8:03 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Johannes Schindelin, (Mon Jun 9, 10:43 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Mon Jun 9, 7:25 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Junio C Hamano, (Mon Jun 9, 6:55 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Johannes Schindelin, (Mon Jun 9, 7:08 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Junio C Hamano, (Mon Jun 9, 7:20 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Mon Jun 9, 7:35 pm)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in com..., Johannes Schindelin, (Fri Jun 6, 8:28 am)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in com..., Johannes Schindelin, (Fri Jun 6, 8:36 am)
[PATCH 10/10] Build in merge, Miklos Vajna, (Thu Jun 5, 4:44 pm)