Re: [PATCH] builtin-merge: missing structure bzero.

From: Miklos Vajna <vmiklos@frugalware.org>
Date: Jul 21, 2008, 17:21 UTC
Message-ID: <20080721172119.GE32057@genesis.frugalware.org>
In-Reply-To: <1216659830-22063-1-git-send-email-madcoder@debian.org>

On Mon, Jul 21, 2008 at 07:03:50PM +0200, Pierre Habouzit <madcoder@debian.org> wrote:

> This cause segfaults when replacing a directory with a submodule in a
> fast-forward.

Thanks.

Show 15 quoted lines

> +test_expect_failure 'Replace a directory with a submodule, with a file conflict' '
> +	mkdir test &&
> +	cd test &&
> +	: create our repository with a sub/a file &&
> +	git init &&
> +	mkdir sub && echo a > sub/a &&
> +	git add sub && git commit -asm"initial repository" &&
> +	: save this state in a new branch &&
> +	git branch temp &&
> +	: then replace sub with it &&
> +	git rm -rf sub &&
> +        git submodule add -- "$(pwd)/../submodule/.git/" sub &&
> +	git commit -asm "replace sub/ with a submodule" &&
> +	: then try to update the "temp" branch &&
> +	git checkout temp &&

It seems this one fails. I guess this will be a problem in the low-level merge code (read-tree -m) and not in builtin-merge.

Show 7 quoted lines

> +	git merge master &&
> +	: and finally cleanse the mess &&
> +	cd .. &&
> +	rm -rf test
> +'
> +
> +test_done