On Thu, Apr 18, 2013 at 3:50 PM, John Keeping <john@xxxxxxxxxxxxx> wrote: > Use the new rev-parse --prefix option to process all paths given to the > submodule command, dropping the requirement that it be run from the > top-level of the repository. > > Signed-off-by: John Keeping <john@xxxxxxxxxxxxx> > --- > diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh > index ff26535..ca0a6ab 100755 > --- a/t/t7400-submodule-basic.sh > +++ b/t/t7400-submodule-basic.sh > @@ -212,6 +212,24 @@ test_expect_success 'submodule add with ./, /.. and // in path' ' > test_cmp empty untracked > ' > > +test_expect_success 'submodule add in subdir' ' A particularly minor nit. Existing subdirectory-related tests in t7400 spell out "subdirectory" fully, so perhaps for consistency: s/subdir/subdirectory/ > + echo "refs/heads/master" >expect && > + >empty && > + > + mkdir addtest/sub && > + ( > + cd addtest/sub && > + git submodule add "$submodurl" ../realsubmod3 && > + git submodule init > + ) && > + > + rm -f heads head untracked && > + inspect addtest/realsubmod3 ../.. && > + test_cmp expect heads && > + test_cmp expect head && > + test_cmp empty untracked > +' > + > test_expect_success 'setup - add an example entry to .gitmodules' ' > GIT_CONFIG=.gitmodules \ > git config submodule.example.url git://example.com/init.git > @@ -319,6 +337,15 @@ test_expect_success 'status should be "up-to-date" after update' ' > grep "^ $rev1" list > ' > > +test_expect_success 'status works correctly from a subdirectory' ' Good: "subdirectory" > + mkdir sub && > + ( > + cd sub && > + git submodule status >../list > + ) && > + grep "^ $rev1" list > +' > + > test_expect_success 'status should be "modified" after submodule commit' ' > ( > cd init && > diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh > index 30b429e..992b66b 100755 > --- a/t/t7401-submodule-summary.sh > +++ b/t/t7401-submodule-summary.sh > @@ -45,6 +45,20 @@ EOF > test_cmp expected actual > " > > +test_expect_success 'run summary from subdir' ' t7401 does not have any existing subdirectory-related tests, but for consistency with t7400, perhaps: s/subdir/subdirectory/ > + mkdir sub && > + ( > + cd sub && > + git submodule summary >../actual > + ) && > + cat >expected <<-EOF && > +* ../sm1 0000000...$head1 (2): > + > Add foo2 > + > +EOF > + test_cmp expected actual > +' > + > commit_file sm1 && > head2=$(add_file sm1 foo3) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html