g | 11 +++++++++++
1 file changed, 11 insertions(+)
New commits:
commit 1b33fd35e6ca50dd229fa3e9af084a82b7cd8cd1
Author: Norbert Thiebaud <[email protected]>
Date: Tue Oct 2 10:32:45 2012 -0500
when switching to a pre-submodule point, clean-up the soft-link point
Change-Id: I5a8f144bb4ad167cfa0e6763e3cf273b9127d65b
diff --git a/g b/g
index d73b8a6..7c6551c 100755
--- a/g
+++ b/g
@@ -137,6 +137,7 @@ do_checkout()
local cmd
local create_branch="0"
local branch
+local module
git checkout "$@" || return $?
for cmd in "$@" ; do
@@ -154,6 +155,11 @@ local branch
fi
else
# now that is the nasty case we moved prior to submodules
+ # delete the submodules left over if any
+ for module in $SUBMODULES_ALL ; do
+ echo "clean-up submodule $module"
+ rm -fr ${module}
+ done
# make sure we have the needed repo in clone
./g clone && ./g -f checkout "$@" || return $?
fi
@@ -167,6 +173,11 @@ do_reset()
git submodule update || return $?
else
# now that is the nasty case we moved prior to submodules
+ # delete the submodules left over if any
+ for module in $SUBMODULES_ALL ; do
+ echo "clean-up submodule $module"
+ rm -fr ${module}
+ done
# make sure we have the needed repo in clone
./g clone && ./g -f reset "$@"
fi
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
