undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar

Browse Source 
Currently git submodule init and git submodule sync fail with an error
if the superproject origin URL is of the form foo but succeed if the
superproject origin URL is of the form ./foo or ./foo/bar or foo/bar.

This change makes handling of the foo case behave like the handling
of the ./foo case and also ensures that superfluous leading and
embedded ./'s are removed from the resulting derived URLs.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jon Seymour 2012-06-06 21:57:30 +10:00 committed by Junio C Hamano
parent 967b2c6673
commit 758615e251
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
git-submodule.sh
View File

@ -60,8 +60,12 @@ resolve_relative_url ()
*:*|/*)
is_relative=
;;
./*|../*)
is_relative=t
;;
*)
is_relative=t
remoteurl="./$remoteurl"
;;
esac
@ -79,7 +83,12 @@ resolve_relative_url ()
sep=:
;;
*)
die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
if test -z "$is_relative" || test "." = "$remoteurl"
then
die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
else
remoteurl=.
fi
;;
esac
;;
@ -90,7 +99,8 @@ resolve_relative_url ()
break;;
esac
done
echo "${is_relative:+${up_path}}$remoteurl$sep${url%/}"
remoteurl="$remoteurl$sep${url%/}"
echo "${is_relative:+${up_path}}${remoteurl#./}"
}
#

6
t/t7400-submodule-basic.sh
View File

@ -564,7 +564,7 @@ test_expect_success '../subrepo works with scp-style URL - user@host:path/to/rep
)
'
test_expect_failure '../subrepo works with relative local path - foo' '
test_expect_success '../subrepo works with relative local path - foo' '
(
cd reltest &&
cp pristine-.git-config .git/config &&
@ -587,7 +587,7 @@ test_expect_success '../subrepo works with relative local path - foo/bar' '
)
'
test_expect_failure '../subrepo works with relative local path - ./foo' '
test_expect_success '../subrepo works with relative local path - ./foo' '
(
cd reltest &&
cp pristine-.git-config .git/config &&
@ -598,7 +598,7 @@ test_expect_failure '../subrepo works with relative local path - ./foo' '
)
'
test_expect_failure '../subrepo works with relative local path - ./foo/bar' '
test_expect_success '../subrepo works with relative local path - ./foo/bar' '
(
cd reltest &&
cp pristine-.git-config .git/config &&

6
t/t7403-submodule-sync.sh
View File

@ -88,7 +88,7 @@ test_expect_success '"git submodule sync" should not vivify uninteresting submod
)
'
test_expect_failure '"git submodule sync" handles origin URL of the form foo' '
test_expect_success '"git submodule sync" handles origin URL of the form foo' '
(cd relative-clone &&
git remote set-url origin foo &&
git submodule sync &&
@ -110,7 +110,7 @@ test_expect_success '"git submodule sync" handles origin URL of the form foo/bar
)
'
test_expect_failure '"git submodule sync" handles origin URL of the form ./foo' '
test_expect_success '"git submodule sync" handles origin URL of the form ./foo' '
(cd relative-clone &&
git remote set-url origin ./foo &&
git submodule sync &&
@ -121,7 +121,7 @@ test_expect_failure '"git submodule sync" handles origin URL of the form ./foo'
)
'
test_expect_failure '"git submodule sync" handles origin URL of the form ./foo/bar' '
test_expect_success '"git submodule sync" handles origin URL of the form ./foo/bar' '
(cd relative-clone &&
git remote set-url origin ./foo/bar &&
git submodule sync &&