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

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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Junio C Hamano
Subject: Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c
Date: Monday, June 9, 2008 - 4: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, 1:44 pm)
[PATCH 09/10] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Thu Jun 5, 1:44 pm)
[PATCH 10/10] Build in merge, Miklos Vajna, (Thu Jun 5, 1:44 pm)
Re: [PATCH 08/10] Introduce commit_list_append() in commit.c, Junio C Hamano, (Thu Jun 5, 4:16 pm)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in c ..., Junio C Hamano, (Thu Jun 5, 8:51 pm)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in c ..., Junio C Hamano, (Thu Jun 5, 10:53 pm)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in c ..., Johannes Schindelin, (Fri Jun 6, 5:28 am)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in c ..., Johannes Schindelin, (Fri Jun 6, 5:30 am)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in c ..., Johannes Schindelin, (Fri Jun 6, 5:36 am)
Re: [PATCH 08/10] Introduce commit_list_append() in commit.c, Miklos Vajna, (Fri Jun 6, 4:52 pm)
Re: [PATCH 08/10] Introduce commit_list_append() in commit.c, Junio C Hamano, (Fri Jun 6, 5:14 pm)
Re: [PATCH 08/10] Introduce commit_list_append() in commit.c, Miklos Vajna, (Fri Jun 6, 7:03 pm)
Re: [PATCH 09/10] Introduce get_octopus_merge_bases() in c ..., Miklos Vajna, (Fri Jun 6, 7:30 pm)
[PATCH] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Sat Jun 7, 2:38 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Johannes Schindelin, (Mon Jun 9, 7:02 am)
[PATCH] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Mon Jun 9, 3:43 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Junio C Hamano, (Mon Jun 9, 3:55 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Junio C Hamano, (Mon Jun 9, 4:06 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Johannes Schindelin, (Mon Jun 9, 4:08 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Junio C Hamano, (Mon Jun 9, 4:20 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Mon Jun 9, 4:25 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Johannes Schindelin, (Mon Jun 9, 4:31 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Mon Jun 9, 4:35 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Junio C Hamano, (Mon Jun 9, 4:41 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Miklos Vajna, (Mon Jun 9, 5:03 pm)
Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c, Johannes Schindelin, (Mon Jun 9, 7:43 pm)