submodule.update: now forcing the checkout - see in-code comments · gitpython-developers/GitPython@ca3fdbe · GitHub

1. gitpython-developers
2. GitPython

Repository navigation

• Code
• Issues6 (6)
• Pull requests2 (2)
• Discussions
• Actions
• Security and quality42 (42)
• Insights

Commit ca3fdbe

Browse filesBrowse the repository at this point in the historyBrowse files

Byron

committed

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

1 parent 8f24f95 commit ca3fdbe
Copy full SHA for ca3fdbe

2 files changed

+8-4Lines changed: 8 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .gitmodules
• lib/git/objects/submodule
  • base.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.gitmodules‎

Copy file name to clipboard

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -1,3 +1,3 @@
1		- [submodule "gitdb"]
2		- path = lib/git/ext/gitdb
3		- url = git://gitorious.org/git-python/gitdb.git
	1	+ [submodule "gitdb"]
	2	+ path = lib/git/ext/gitdb
	3	+ url = git://gitorious.org/git-python/gitdb.git

Collapse file

‎lib/git/objects/submodule/base.py‎

Copy file name to clipboardExpand all lines: lib/git/objects/submodule/base.py

+5-1Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -387,7 +387,11 @@ def update(self, recursive=False, init=True, to_latest_revision=False):
387	387	# update the working tree
388	388	if mrepo.head.commit.binsha != binsha:
389	389	if is_detached:
390		- mrepo.git.checkout(hexsha)
	390	+ # NOTE: for now we force, the user is no supposed to change detached
	391	+ # submodules anyway. Maybe at some point this becomes an option, to
	392	+ # properly handle user modifications - see below for future options
	393	+ # regarding rebase and merge.
	394	+ mrepo.git.checkout(hexsha, force=True)
391	395	else:
392	396	# TODO: allow to specify a rebase, merge, or reset
393	397	# TODO: Warn if the hexsha forces the tracking branch off the remote

0 commit comments

Comments

0 (0)