# [PATCH] Teach "git-merge" that "stupid" merge strategy no longer exists 4 messages from 2008-07-20 to 2008-07-20. Participants: Nanako Shiraishi, Miklos Vajna, Junio C Hamano. Thread: https://gitlist.dev/t/14543 ## Nanako Shiraishi, 2008-07-20 10:21 Subject: [PATCH] Teach "git-merge" that "stupid" merge strategy no longer exists Message-ID: <20080720192125.6117@nanako3.lavabit.com> URL: https://gitlist.dev/e/20080720192125.6117%40nanako3.lavabit.com ``` Next release 1.6.0 will not have "stupid" merge strategy, but "git merge -s confused origin" still includs it in the list of available merge strategies. Signed-off-by: Nanako Shiraishi --- builtin-merge.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/builtin-merge.c b/builtin-merge.c index 129b4e6..edc6016 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -54,7 +54,6 @@ static struct strategy all_strategy[] = { { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL }, { "octopus", DEFAULT_OCTOPUS }, { "resolve", 0 }, - { "stupid", 0 }, { "ours", NO_FAST_FORWARD | NO_TRIVIAL }, { "subtree", NO_FAST_FORWARD | NO_TRIVIAL }, }; -- 1.5.6.3 -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ ``` ## Miklos Vajna, 2008-07-20 12:12 Subject: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists Message-ID: <1216555968-31406-1-git-send-email-vmiklos@frugalware.org> URL: https://gitlist.dev/e/1216555968-31406-1-git-send-email-vmiklos%40frugalware.org In-Reply-To: <20080720192125.6117@nanako3.lavabit.com> ``` It co-existed with 'recursive' when rewriting it in C, but it no longer available. Signed-off-by: Miklos Vajna --- On Sun, Jul 20, 2008 at 07:21:25PM +0900, Nanako Shiraishi wrote: > - { "stupid", 0 }, If we are at it, recur is also something unnecessary here. builtin-merge.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/builtin-merge.c b/builtin-merge.c index 129b4e6..beba635 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -50,7 +50,6 @@ static size_t use_strategies_nr, use_strategies_alloc; static const char *branch; static struct strategy all_strategy[] = { - { "recur", NO_TRIVIAL }, { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL }, { "octopus", DEFAULT_OCTOPUS }, { "resolve", 0 }, -- 1.5.6.2.450.g8d367.dirty ``` ## Junio C Hamano, 2008-07-20 18:33 Subject: Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists Message-ID: <7vmykc76dn.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vmykc76dn.fsf%40gitster.siamese.dyndns.org In-Reply-To: <1216555968-31406-1-git-send-email-vmiklos@frugalware.org> ``` Miklos Vajna writes: > It co-existed with 'recursive' when rewriting it in C, but it no longer > available. > > Signed-off-by: Miklos Vajna > --- > > On Sun, Jul 20, 2008 at 07:21:25PM +0900, Nanako Shiraishi wrote: >> - { "stupid", 0 }, > > If we are at it, recur is also something unnecessary here. Good eyes, both of you. Will roll a die and commit one squashed, creditting one of you at random ;-) ``` ## Miklos Vajna, 2008-07-20 18:50 Subject: Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists Message-ID: <20080720185005.GN10347@genesis.frugalware.org> URL: https://gitlist.dev/e/20080720185005.GN10347%40genesis.frugalware.org In-Reply-To: <7vmykc76dn.fsf@gitster.siamese.dyndns.org> ``` On Sun, Jul 20, 2008 at 11:33:24AM -0700, Junio C Hamano wrote: > Good eyes, both of you. Will roll a die and commit one squashed, > creditting one of you at random ;-) I thought commit messages can have multiple Signed-off-by lines. ;-) ```