Commitca3fdbe

committed

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

1 parent8f24f95 commitca3fdbeCopy full SHA for ca3fdbe

File tree

-4

lines changed

-4

lines changed

Lines 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`

Lines 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`	`ifmrepo.head.commit.binsha!=binsha:`
`389`	`389`	`ifis_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`

Comments

(0)

ページ先頭