[PATCH] submodule: handle trailing slash, warn about non-submodules
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Feb 6, 2009, 04:00 UTC
- Message-ID
- <b14e34d2529721c24437ec9da3f8f15c916d4051.1233892769u.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1233892769u.git.johannes.schindelin@gmx.de>
Earlier, when you called
git submodule path/to/submodule/
(which happens easily if you are a heavy user of tab-completion), Git would silently ignore the given path, as "git ls-files path/to/submodule/" does not return anything due to the trailing slash.
Git would also silently ignore paths that do not point to submodules at all, without warning the user about the likely mistake.
Now, "git submodule" strips trailing slashes, and it warns about parameters that are no submodules.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- git-submodule.sh | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index 2f47e06..b878909 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -59,7 +59,19 @@ resolve_relative_url () # module_list() { - git ls-files --stage -- "$@" | grep '^160000 ' + while test $# -gt 0 + do + line=$(git ls-files --stage ${1%/} | grep '^160000 ') + case "$line" in + '') + echo "Warning: ignoring non-submodule '$1'" >&2 + ;; + *) + echo "$line" + ;; + esac + shift + done } #
-- 1.6.1.2.630.g01a7e