Re: [PATCH 4/7] t5520: test work tree fast-forward when fetch updates head
On Sat, May 2, 2015 at 11:37 AM, Paul Tan <pyokagan@gmail.com> wrote:
Show 7 quoted lines
> Since commit b10ac50f (Fix pulling into the same branch), git-pull,
> upon detecting that git-fetch updated the current head, will
> fast-forward the working tree to the updated head commit.
>
> Implement tests to ensure that the fast-forward occurs in such a case,
> as well as to ensure that the user-friendly advice is printed upon
> failure.
Show 35 quoted lines
> ---
> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
> index 9f57e0d..25d519d 100755
> --- a/t/t5520-pull.sh
> +++ b/t/t5520-pull.sh
> @@ -189,6 +189,27 @@ test_expect_success 'fail if the index has unresolved entries' '
> test_i18ngrep "You have not concluded your merge" out
> '
>
> +test_expect_success 'fast-forwards working tree if branch head is updated' '
> + git checkout -b third master^ &&
> + test_when_finished "git checkout -f copy && git branch -D third" &&
> + echo file >expected &&
> + test_cmp expected file &&
> + git pull . second:third 2>out &&
> + test_i18ngrep "fetch updated the current branch head" out &&
> + echo modified >expected &&
> + test_cmp expected file
> +'
> +
> +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_expect_success '--rebase' '
> git branch to-rebase &&
> echo modified again > file &&
> --
> 2.1.4
Eric Sunshine <sunshine@sunshineco.com>