@@ -67,7 +67,7 @@ class Repo(object):
6767 'git_dir' is the .git repository directory, which is always set."""
6868DAEMON_EXPORT_FILE = 'git-daemon-export-ok'
6969
70- _git = None # Must exist, or __del__ will fail in case we raise on `__init__()`
70+ git = None # Must exist, or __del__ will fail in case we raise on `__init__()`
7171working_dir = None
7272_working_tree_dir = None
7373git_dir = None
@@ -203,42 +203,14 @@ def __init__(self, path=None, odbt=GitCmdObjectDB, search_parent_directories=Fal
203203# END working dir handling
204204
205205self .working_dir = self ._working_tree_dir or self .common_dir
206+ self .git = self .GitCommandWrapperType (self .working_dir )
206207
207208# special handling, in special times
208209args = [osp .join (self .common_dir ,'objects' )]
209210if issubclass (odbt ,GitCmdObjectDB ):
210211args .append (self .git )
211212self .odb = odbt (* args )
212213
213- def _get_git (self ):
214- working_dir = self ._working_tree_dir or self .common_dir
215- if self ._git :
216- if self ._git ._working_dir != expand_path (working_dir ):
217- self .close ()
218- self ._git = None
219-
220- if not self ._git :
221- self ._git = self .GitCommandWrapperType (working_dir )
222- return self ._git
223-
224- def _del_git (self ):
225- if self ._git :
226- self ._git .clear_cache ()
227- self ._git = None
228- # Tempfiles objects on Windows are holding references to
229- # open files until they are collected by the garbage
230- # collector, thus preventing deletion.
231- # TODO: Find these references and ensure they are closed
232- # and deleted synchronously rather than forcing a gc
233- # collection.
234- if is_win :
235- gc .collect ()
236- gitdb .util .mman .collect ()
237- if is_win :
238- gc .collect ()
239-
240- git = property (fget = _get_git ,fdel = _del_git )
241-
242214def __enter__ (self ):
243215return self
244216
@@ -252,7 +224,19 @@ def __del__(self):
252224pass
253225
254226def close (self ):
255- del self .git
227+ if self .git :
228+ self .git .clear_cache ()
229+ # Tempfiles objects on Windows are holding references to
230+ # open files until they are collected by the garbage
231+ # collector, thus preventing deletion.
232+ # TODO: Find these references and ensure they are closed
233+ # and deleted synchronously rather than forcing a gc
234+ # collection.
235+ if is_win :
236+ gc .collect ()
237+ gitdb .util .mman .collect ()
238+ if is_win :
239+ gc .collect ()
256240
257241def __eq__ (self ,rhs ):
258242if isinstance (rhs ,Repo ):
@@ -448,15 +432,7 @@ def _get_config_path(self, config_level):
448432elif config_level == "global" :
449433return osp .normpath (osp .expanduser ("~/.gitconfig" ))
450434elif config_level == "repository" :
451- try :
452- config_path = self .git .rev_parse ("config" ,git_path = True )
453- except GitCommandError :
454- return osp .normpath (osp .join (self ._common_dir or self .git_dir ,"config" ))
455- else :
456- if self .git ._working_dir :
457- return osp .normpath (osp .join (self .git ._working_dir ,config_path ))
458- else :
459- return config_path
435+ return osp .normpath (osp .join (self ._common_dir or self .git_dir ,"config" ))
460436
461437raise ValueError ("Invalid configuration level: %r" % config_level )
462438
