diff options
| author | John Keeping <john@keeping.me.uk> | 2013-06-16 15:18:18 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-17 13:30:01 -0700 |
| commit | 091a6eb0feed820a43663ca63dc2bc0bb247bbae (patch) | |
| tree | b4a6a61b74de57b56288d17b3613193a616c06db /t/t7401-submodule-summary.sh | |
| parent | 12b9d32790b40bf3ea49134095619700191abf1f (diff) | |
| download | git-091a6eb0feed820a43663ca63dc2bc0bb247bbae.tar.gz | |
submodule: drop the top-level requirement
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.
Since the interpretation of a relative submodule URL depends on whether
or not "remote.origin.url" is configured, explicitly block relative URLs
in "git submodule add" when not at the top level of the working tree.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7401-submodule-summary.sh')
| -rwxr-xr-x | t/t7401-submodule-summary.sh | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index c32872658c..ac2434c0db 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -45,6 +45,42 @@ EOF test_cmp expected actual " +test_expect_success 'added submodule (subdirectory)' " + mkdir sub && + ( + cd sub && + git submodule summary >../actual + ) && + cat >expected <<-EOF && +* ../sm1 0000000...$head1 (2): + > Add foo2 + +EOF + test_cmp expected actual +" + +test_expect_success 'added submodule (subdirectory only)' " + ( + cd sub && + git submodule summary . >../actual + ) && + >expected && + test_cmp expected actual +" + +test_expect_success 'added submodule (subdirectory with explicit path)' " + ( + cd sub && + git submodule summary ../sm1 >../actual + ) && + cat >expected <<-EOF && +* ../sm1 0000000...$head1 (2): + > Add foo2 + +EOF + test_cmp expected actual +" + commit_file sm1 && head2=$(add_file sm1 foo3) |