X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=inline;f=submodules%2Funabsorbgitdirs-recursive;h=f7427fc31e191985067804f29043074d3d35d003;hb=50a94c682ccd5d2ab4cf2cfe954a10132077e608;hp=72b4464a6ceb8ba54acc8eb3d4fd12b462b2fdb8;hpb=99f22d0045c5002c384a599cc0f0b203f429eedf;p=git-scripts.git diff --git a/submodules/unabsorbgitdirs-recursive b/submodules/unabsorbgitdirs-recursive index 72b4464..f7427fc 100755 --- a/submodules/unabsorbgitdirs-recursive +++ b/submodules/unabsorbgitdirs-recursive @@ -18,14 +18,14 @@ cd "`git rev-parse --show-toplevel`" unset GIT_DIR # If .git/ subdirectory is already here -test -d .git && exit 0 +[ -d .git ] && exit 0 -if ! test -f .git; then +if ! [ -f .git ]; then echo "Error: Cannot find gitlink, aborting" >&2 exit 1 fi -if test -f .gitmodules; then +if [ -f .gitmodules ]; then git submodule foreach "$PROG_DIR"/"`basename \"$0\"`" fi @@ -33,6 +33,10 @@ fi git config --unset core.worktree read _gitdir gitpath < .git +if [ "$_gitdir" != gitdir: ]; then + echo "Error: Bad gitlink, aborting" >&2 + exit 1 +fi unset _gitdir rm .git exec mv "$gitpath" .git