From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 07 May 2015 17:12:59 GMT
Subject: Re: [PATCH v2 03/12] t5520: test work tree fast-forward when fetch updates head
Message-ID: <xmqqoalwqpk4.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1430988248-18285-4-git-send-email-pyokagan@gmail.com>

Paul Tan <pyokagan@gmail.com> writes:

> +test_expect_success 'fast-forward fails with conflicting work tree' '
> +	git checkout -b third master^ &&
> +	test_when_finished "git checkout -f copy && git branch -D third" &&
> +	echo file >expected &&
> +	test_cmp expected file &&
> +	echo conflict >file &&
> +	test_must_fail git pull . second:third 2>out &&
> +	test_i18ngrep "Cannot fast-forward your working tree" out &&
> +	test `cat file` = conflict

At this point, HEAD would match either master^ (as initially checked
out) or second (as fetch fast-forwarded), but I cannot read what this
test is expecting to happen.  

Should the HEAD move or stay?

> +'
> +
>  test_expect_success '--rebase' '
>  	git branch to-rebase &&
>  	echo modified again > file &&