Commit1c8310d

authored

Merge pull request#1618 from bodograumann/fix-set-tracking-branch-with-imports

Disable merge_includes in config writers

2 parentsb543c72 +41ecc6a commit1c8310dCopy full SHA for 1c8310d

File tree

+22

-1

lines changed

+22

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,7 @@ def config_writer(self, config_level: Lit_config_levels = "repository") -> GitCo`
`600`	`600`	`system = system wide configuration file`
`601`	`601`	`global = user level configuration file`
`602`	`602`	`repository = configuration file for this repository only"""`
`603`		`-returnGitConfigParser(self._get_config_path(config_level),read_only=False,repo=self)`
	`603`	`+returnGitConfigParser(self._get_config_path(config_level),read_only=False,repo=self,merge_includes=False)`
`604`	`604`
`605`	`605`	`defcommit(self,rev:Union[str,Commit_ish,None]=None)->Commit:`
`606`	`606`	`"""The Commit object for the specified revision`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`SymbolicReference,`
`16`	`16`	`GitCommandError,`
`17`	`17`	`RefLog,`
	`18`	`+GitConfigParser,`
`18`	`19`	`)`
`19`	`20`	`fromgit.objects.tagimportTagObject`
`20`	`21`	`fromtest.libimportTestBase,with_rw_repo`
`@@ -172,6 +173,26 @@ def test_heads(self, rwrepo):`
`172`	`173`	`assertlog[0].oldhexsha==pcommit.NULL_HEX_SHA`
`173`	`174`	`assertlog[0].newhexsha==pcommit.hexsha`
`174`	`175`
	`176`	`+@with_rw_repo("HEAD",bare=False)`
	`177`	`+deftest_set_tracking_branch_with_import(self,rwrepo):`
	`178`	`+# prepare included config file`
	`179`	`+included_config=osp.join(rwrepo.git_dir,"config.include")`
	`180`	`+withGitConfigParser(included_config,read_only=False)aswriter:`
	`181`	`+writer.set_value("test","value","test")`
	`182`	`+assertosp.exists(included_config)`
	`183`	`+`
	`184`	`+withrwrepo.config_writer()aswriter:`
	`185`	`+writer.set_value("include","path",included_config)`
	`186`	`+`
	`187`	`+forheadinrwrepo.heads:`
	`188`	`+head.set_tracking_branch(None)`
	`189`	`+asserthead.tracking_branch()isNone`
	`190`	`+remote_ref=rwrepo.remotes[0].refs[0]`
	`191`	`+asserthead.set_tracking_branch(remote_ref)ishead`
	`192`	`+asserthead.tracking_branch()==remote_ref`
	`193`	`+head.set_tracking_branch(None)`
	`194`	`+asserthead.tracking_branch()isNone`
	`195`	`+`
`175`	`196`	`deftest_refs(self):`
`176`	`197`	`types_found=set()`
`177`	`198`	`forrefinself.rorepo.refs:`

Comments

(0)