Currently git calculates the submodule origin URL incorrectly in
the case that the superproject origin URL is denormalized.
So, we normalize the path part of the superproject URL before iterating
over the leading ../ parts of the submodule URL.
A remaining problem related to the handling of consecutive repeated ./'s
in the superproject origin URL is deferred to a subsequent commit.
This change also fixes a subtle error in the setup of some tests which was
masked by the denormalization issue that is now fixed.
Previous behaviour was relying on submodule add to clone trash/submodule
into super/submodule, however from the perspective of super's origin (i.e. trash),
the origin submodule is actually located at ./submodule not ../submodule.
However, because the origin URL of super was denormalized (it had a trailing /.)
the incorrect handling of denormalized super URLs actually produced
the correct result - a case of two errors cancelling out each other's
effects.
Now that normalization is fixed, the erroneous use of git submodule add
by the test setups needs to be fixed. The cleanest way to do this is to
clone super not from ., but from ./omega. The subsequent invocation of
git submodule add ../submodule submodule
now does the expected thing because ../submodule is the correct
path from omega to the submodule origin repo.
Signed-off-by: Jon Seymour <jon.seymour@xxxxxxxxx>
---
git-submodule.sh | 1 +
t/t7400-submodule-basic.sh | 10 +++++-----
t/t7403-submodule-sync.sh | 14 +++++++++-----
t/t7406-submodule-update.sh | 16 ++++++++++------
t/t7407-submodule-foreach.sh | 14 +++++++++-----
t/t7506-status-submodule.sh | 10 +++++++++-
6 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 9ca2ffe..1f0983c 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -76,6 +76,7 @@ resolve_relative_url ()
;;
esac
invariant="${remoteurl%$variant}"
+ variant="$(normalize_path "$variant")"
while test -n "$url"
do
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index a94c5e9..b01f479 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -521,7 +521,7 @@ test_expect_failure 'relative path works with URL - ssh://hostname/path/detour/.
)
'
-test_expect_failure 'relative path works with URL - ssh://hostname/path/repo/.' '
+test_expect_success 'relative path works with URL - ssh://hostname/path/repo/.' '
(
cd reltest &&
cp pristine-.git-config .git/config &&
@@ -663,7 +663,7 @@ test_expect_success '../subrepo works with scp-style URL - user@host:path/to/rep
)
'
-test_expect_failure 'relative path works with user@host:path/to/repo/.' '
+test_expect_success 'relative path works with user@host:path/to/repo/.' '
(
cd reltest &&
cp pristine-.git-config .git/config &&
@@ -674,7 +674,7 @@ test_expect_failure 'relative path works with user@host:path/to/repo/.' '
)
'
-test_expect_failure 'relative path works with user@host:path/to/./repo' '
+test_expect_success 'relative path works with user@host:path/to/./repo' '
(
cd reltest &&
cp pristine-.git-config .git/config &&
@@ -696,7 +696,7 @@ test_expect_failure 'relative path works with user@host:path/to/././repo' '
)
'
-test_expect_failure 'relative path works with user@host:path/to/detour/../repo' '
+test_expect_success 'relative path works with user@host:path/to/detour/../repo' '
(
cd reltest &&
cp pristine-.git-config .git/config &&
@@ -773,7 +773,7 @@ test_expect_success '../subrepo works with relative local path - ../foo/bar' '
)
'
-test_expect_failure 'relative path works with ../foo/./bar' '
+test_expect_success 'relative path works with ../foo/./bar' '
(
cd reltest &&
cp pristine-.git-config .git/config &&
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index b7466ba..d76e49f 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -11,11 +11,15 @@ These tests exercise the "git submodule sync" subcommand.
. ./test-lib.sh
test_expect_success setup '
- echo file > file &&
- git add file &&
- test_tick &&
- git commit -m upstream &&
- git clone . super &&
+ mkdir omega &&
+ (cd omega &&
+ git init &&
+ echo file > file &&
+ git add file &&
+ test_tick &&
+ git commit -m upstream
+ ) &&
+ git clone omega super &&
git clone super submodule &&
(cd super &&
git submodule add ../submodule submodule &&
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index dcb195b..8b6c330 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -22,11 +22,15 @@ compare_head()
test_expect_success 'setup a submodule tree' '
- echo file > file &&
- git add file &&
- test_tick &&
- git commit -m upstream &&
- git clone . super &&
+ mkdir omega &&
+ (cd omega &&
+ git init &&
+ echo file > file &&
+ git add file &&
+ test_tick &&
+ git commit -m upstream
+ ) &&
+ git clone omega super &&
git clone super submodule &&
git clone super rebasing &&
git clone super merging &&
@@ -58,7 +62,7 @@ test_expect_success 'setup a submodule tree' '
git submodule add ../merging merging &&
test_tick &&
git commit -m "rebasing"
- )
+ ) &&
(cd super &&
git submodule add ../none none &&
test_tick &&
diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 9b69fe2..40f957c 100755
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -13,11 +13,15 @@ that are currently checked out.
test_expect_success 'setup a submodule tree' '
- echo file > file &&
- git add file &&
- test_tick &&
- git commit -m upstream &&
- git clone . super &&
+ mkdir omega &&
+ (cd omega &&
+ git init &&
+ echo file > file &&
+ git add file &&
+ test_tick &&
+ git commit -m upstream
+ ) &&
+ git clone omega super &&
git clone super submodule &&
(
cd super &&
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index d31b34d..764c1d0 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -197,7 +197,15 @@ A sub1
EOF
test_expect_success 'status with merge conflict in .gitmodules' '
- git clone . super &&
+ mkdir omega &&
+ (cd omega &&
+ git init &&
+ echo file > file &&
+ git add file &&
+ test_tick &&
+ git commit -m upstream
+ ) &&
+ git clone omega super &&
test_create_repo_with_commit sub1 &&
test_tick &&
test_create_repo_with_commit sub2 &&
--
1.7.10.2.656.g24a6219
--
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