Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree

From: Jeff King <peff@peff.net>
Date: Jun 20, 2013, 13:15 UTC
Message-ID: <20130620131547.GA11073@sigill.intra.peff.net>
In-Reply-To: <aca810600b895ed3f0a3fc575e0f6861e591de5b.1371733403.git.trast@inf.ethz.ch>

On Thu, Jun 20, 2013 at 03:06:01PM +0200, Thomas Rast wrote:

Show 13 quoted lines

> +test_expect_success 'pulling into void does not overwrite staged files' '
> +	git init cloned-staged-colliding &&
> +	(
> +		cd cloned-staged-colliding &&
> +		echo "alternate content" >file &&
> +		git add file &&
> +		test_must_fail git pull .. master &&
> +		echo "alternate content" >expect &&
> +		test_cmp expect file &&
> +		git cat-file blob :file >file.index &&
> +		test_cmp expect file.index
> +	)
> +'

I naively would have expected this to leave us in a conflicted state over "file". But I guess read-tree just rejects it, because we are not doing a real three-way merge. I'm not sure it is that big a deal; this is more about safety than about creating a conflicted/resolvable state.

-Peff