submodule.update: now forcing the checkout - see in-code comments

Byron · Byron · commit ca3fdbe2232c · 2010-11-20T20:46:21.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "gitdb"]
-	path = lib/git/ext/gitdb
-	url = git://gitorious.org/git-python/gitdb.git
+[submodule "gitdb"]
+	path = lib/git/ext/gitdb
+	url = git://gitorious.org/git-python/gitdb.git
diff --git a/lib/git/objects/submodule/base.py b/lib/git/objects/submodule/base.py
@@ -387,7 +387,11 @@ def update(self, recursive=False, init=True, to_latest_revision=False):
 		# update the working tree
 		if mrepo.head.commit.binsha != binsha:
 			if is_detached:
-				mrepo.git.checkout(hexsha)
+				# NOTE: for now we force, the user is no supposed to change detached
+				# submodules anyway. Maybe at some point this becomes an option, to 
+				# properly handle user modifications - see below for future options
+				# regarding rebase and merge.
+				mrepo.git.checkout(hexsha, force=True)
 			else:
 				# TODO: allow to specify a rebase, merge, or reset
 				# TODO: Warn if the hexsha forces the tracking branch off the remote
