Commitb00ad00

committed

submodule: When adding an existing submodule, when retrieving the binsha, we will now consider not only the tree, but the index too

1 parent2ab454f commitb00ad00Copy full SHA for b00ad00

File tree

-1

lines changed

-1

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,15 @@ def add(cls, repo, name, path, url=None, branch=None, no_checkout=False):`
`215`	`215`	`sm=cls(repo,cls.NULL_BIN_SHA,cls.k_default_mode,path,name)`
`216`	`216`	`ifsm.exists():`
`217`	`217`	`# reretrieve submodule from tree`
`218`		`-returnrepo.head.commit.tree[path]`
	`218`	`+try:`
	`219`	`+returnrepo.head.commit.tree[path]`
	`220`	`+exceptKeyError:`
	`221`	`+# could only be in index`
	`222`	`+index=repo.index`
	`223`	`+entry=index.entries[index.entry_key(path,0)]`
	`224`	`+sm.binsha=entry.binsha`
	`225`	`+returnsm`
	`226`	`+# END handle exceptions`
`219`	`227`	`# END handle existing`
`220`	`228`
`221`	`229`	`br=mkhead(repo,branchorcls.k_head_default)`

Comments

(0)