Re: [PATCH 4/4] reset: add test cases for "--merge-dirty" option

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Sep 10, 2009, 22:14 UTC
Message-ID: <alpine.LNX.2.00.0909101757530.28290@iabervon.org>
In-Reply-To: <20090910202333.3722.13214.chriscool@tuxfamily.org>

On Thu, 10 Sep 2009, Christian Couder wrote:

    This shows that with the "--merge-dirty" option,

  changes that are both in the work tree and the index are kept

    in the work tree after the reset (but discarded in the index). As with 
    the "--merge" option,

  changes that are in both the work tree and the index are discarded

    after the reset.

I'm lost here.

If you have:

         working index HEAD target
version     B      B     A     A

You get:

         working index HEAD target
--m-d       B      A     A     A
--merge     A      A     A     A

Show 14 quoted lines

> ---
>  t/t7110-reset-merge.sh |   54 +++++++++++++++++++++++++++++++++++++++++++----
>  1 files changed, 49 insertions(+), 5 deletions(-)
> 
> diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
> index 45714ae..1e6d634 100755
> --- a/t/t7110-reset-merge.sh
> +++ b/t/t7110-reset-merge.sh
> @@ -19,7 +19,7 @@ test_expect_success 'creating initial files' '
>       git commit -m "Initial commit"
>  '
>  
> -test_expect_success 'ok with changes in file not changed by reset' '
> +test_expect_success '--merge: ok if changes in file not touched by reset' '

Should probably have the "--merge: " from the beginning, since you're adding the test in this series anyway. That would make the diff come out clearer.

	-Daniel
*This .sig left intentionally blank*