summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2012-06-06 21:57:30 +1000
committerJunio C Hamano <gitster@pobox.com>2012-06-06 11:43:55 -0700
commit758615e2517db8b9fda9218afded06a3e1b42e20 (patch)
tree37a6269f16ea0852b6a68b4c6f9c57fe119a67d9 /git-submodule.sh
parent967b2c66738fe6b168ead0c3106ac47fb9ae22c7 (diff)
downloadgit-758615e2517db8b9fda9218afded06a3e1b42e20.tar.gz
submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar
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>
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-xgit-submodule.sh14
1 files changed, 12 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 0a3e1465e3..b0b6ccbe72 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -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#./}"
}
#