Vasily Titskiy <qeh...@gmail.com> writes: > diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh > index 2142c1f..1be62f3 100755 > --- a/t/t3903-stash.sh > +++ b/t/t3903-stash.sh > @@ -731,4 +731,38 @@ test_expect_success 'stash list --cc shows combined > diff' ' > test_cmp expect actual > ' > > +test_expect_success 'stash ignores changes in submodules' ' > + git submodule init &&
Hmmmm... what is this "submodule init" needed for at this point in the test sequence? > + git init sub1 && > + ( > + cd sub1 && > + echo "x" >file1 && > + 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 > +' > + > test_done -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
