Commite40ad63

committed

Fixed PY3 support.

Apparently, thanks to an incorrect version check, PY3 ended up usinga git command object database by default. This is now fixed.Additionally, the update_cache code was adjusted to check for method-existence,as it's valid to use object databases which simply don't have acaching mechanism (like the git command object database)

1 parent46889d1 commite40ad63Copy full SHA for e40ad63

File tree

2 files changed

-3

lines changed

git
- remote.py
- repo
  - base.py

2 files changed

-3

lines changed

`‎git/remote.py`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,8 @@ def fetch(self, refspec=None, progress=None, **kwargs):`
`611`	`611`
`612`	`612`	`proc=self.repo.git.fetch(self,args,with_extended_output=True,as_process=True,v=True,*kwargs)`
`613`	`613`	`res=self._get_fetch_info_from_stderr(proc,progressorRemoteProgress())`
`614`		`-self.repo.odb.update_cache()`
	`614`	`+ifhasattr(self.repo.odb,'update_cache'):`
	`615`	`+self.repo.odb.update_cache()`
`615`	`616`	`returnres`
`616`	`617`
`617`	`618`	`defpull(self,refspec=None,progress=None,**kwargs):`
`@@ -625,7 +626,8 @@ def pull(self, refspec=None, progress=None, **kwargs):`
`625`	`626`	`kwargs=add_progress(kwargs,self.repo.git,progress)`
`626`	`627`	`proc=self.repo.git.pull(self,refspec,with_extended_output=True,as_process=True,v=True,**kwargs)`
`627`	`628`	`res=self._get_fetch_info_from_stderr(proc,progressorRemoteProgress())`
`628`		`-self.repo.odb.update_cache()`
	`629`	`+ifhasattr(self.repo.odb,'update_cache'):`
	`630`	`+self.repo.odb.update_cache()`
`629`	`631`	`returnres`
`630`	`632`
`631`	`633`	`defpush(self,refspec=None,progress=None,**kwargs):`

`‎git/repo/base.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`	`importre`
`60`	`60`
`61`	`61`	`DefaultDBType=GitDB`
`62`		`-ifsys.version_info[1]<5:# python 2.4 compatiblity`
	`62`	`+ifsys.version_info[:2]<(2,5):# python 2.4 compatiblity`
`63`	`63`	`DefaultDBType=GitCmdObjectDB`
`64`	`64`	`# END handle python 2.4`
`65`	`65`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite40ad63

File tree

2 files changed

2 files changed

`‎git/remote.py`

`‎git/repo/base.py`

0 commit comments