Re: [PATCH v1 2/2] Ignore dirty submodule states during stash

From: Eric Sunshine <sunshine@sunshineco.com>
Date: May 17, 2016, 03:49 UTC
Message-ID: <CAPig+cTShM4Qc7sVN5NXSmwP8Cxz22q+ZAbSrW3bHVm66aaCQg@mail.gmail.com>
In-Reply-To: <20160517034050.GC2782@gmail.com>

On Mon, May 16, 2016 at 11:40 PM, Vasily Titskiy <qehgt0@gmail.com> wrote:

> It checks if 'stash pop' does not trigger merge conflics
> in submodules.

Missing sign-off.

Also, it would be best to combine these two patches so that the fix and patch reside in a single patch.

More below...

Show 9 quoted lines

> ---
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> @@ -731,4 +731,39 @@ test_expect_success 'stash list --cc shows combined diff' '
> +test_expect_success 'stash ignores changes in submodules' '
> +       git submodule init &&
> +       git init sub1 &&
> +       (
> +               cd sub1 &&
> +               echo "x" > file1 &&

Style: Drop space after redirection operator: >file1

Ditto below for both '>' and '>>'.

Show 29 quoted lines

> +               git add file1 &&
> +               git commit -a -m "initial sub1"
> +       ) &&
> +       git submodule add ./. sub1 &&
> +       echo "main" > file1 &&
> +       git add file1 &&
> +       git commit -a -m "initial main" &&
> +       # make changes in submodule
> +       (
> +               cd sub1 &&
> +               echo "y" >> file1 &&
> +               git commit -a -m "change y"
> +       ) &&
> +       git commit sub1 -m "update reference" &&
> +       # switch submodule to another revision
> +       (
> +               cd sub1 &&
> +               echo "z" >> file1 &&
> +               git commit -a -m "change z"
> +       ) &&
> +       # everything is prepared, check if changes in submodules are ignored
> +       echo "local change" >> file1 &&
> +       git stash save &&
> +       git checkout HEAD~1 &&
> +       git submodule update &&
> +       git stash pop
> +'
> +
> +

Style: drop extra blank line

>  test_done
> --
> 2.1.4