From 2c5cdc4d3e479576f13e4307f0be1c6170e34756 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Tue, 2 Oct 2012 10:32:45 -0500
Subject: when switching to a pre-submodule point, clean-up the soft-link point

Change-Id: I5a8f144bb4ad167cfa0e6763e3cf273b9127d65b
---
 g | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'g')

diff --git a/g b/g
index d73b8a6052fa..7c6551c892f6 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
-- 
cgit