[PATCH] Teach "git-merge" that "stupid" merge strategy no longer exists

[PATCH] Teach "git-merge" that "stupid" merge strategy no longer exists

[Nanako Shiraishi]

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 <nanako3@lavabit.com>
---
 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/

[PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists

[Miklos Vajna]

It co-existed with 'recursive' when rewriting it in C, but it no longer
available.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---

On Sun, Jul 20, 2008 at 07:21:25PM +0900, Nanako Shiraishi <nanako3@lavabit.com> 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

Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists

[Junio C Hamano]

Miklos Vajna <vmiklos@frugalware.org> writes:

> It co-existed with 'recursive' when rewriting it in C, but it no longer
> available.
>
> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
> ---
>
> On Sun, Jul 20, 2008 at 07:21:25PM +0900, Nanako Shiraishi <nanako3@lavabit.com> 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 ;-)

Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

On Sun, Jul 20, 2008 at 11:33:24AM -0700, Junio C Hamano <gitster@pobox.com> 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. ;-)

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]