diff --git a/git-submodule.sh b/git-submodule.sh
index 204aab671ef78edc24acff4019a2f40a71a59020..0a27232b90456b5471ee64d5dcf9965ad73f28af 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
;;
esac
- # strip trailing slashes from path
- path=$(echo "$path" | sed -e 's|/*$||')
-
+ # normalize path:
+ # multiple //; leading ./; /./; /../; trailing /
+ path=$(printf '%s/\n' "$path" |
+ sed -e '
+ s|//*|/|g
+ s|^\(\./\)*||
+ s|/\./|/|g
+ :start
+ s|\([^/]*\)/\.\./||
+ tstart
+ s|/*$||
+ ')
git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
die "'$path' already exists in the index"