From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Aug 2011 23:22:14 GMT
Subject: Re: [PATCH] allow multiple calls to submodule merge search for the same path
Message-ID: <7vwre1gjq1.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110825211144.GA67523@book.hvoigt.net>

Heiko Voigt <hvoigt@hvoigt.net> writes:

> diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
> index 8f6f2d6..603fb72 100755
> --- a/t/t7405-submodule-merge.sh
> +++ b/t/t7405-submodule-merge.sh
> @@ -269,7 +269,7 @@ test_expect_success 'setup for recursive merge with submodule' '
>  '
>  
>  # merge should leave submodule unmerged in index
> -test_expect_failure 'recursive merge with submodule' '
> +test_expect_success 'recursive merge with submodule' '
>  	(cd merge-recursive &&
>  	 test_must_fail git merge top-bc &&
>  	 echo "160000 $(git rev-parse top-cb:sub) 2	sub" > expect2 &&

What is this patch based on?