X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/074b62564dec55c8730d2010119192bd479b3c8e..c73e63b7d7733f1308c2c0c504144e93062bb489:/stgit/git.py diff --git a/stgit/git.py b/stgit/git.py index 4c5685a..249080e 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -449,10 +449,10 @@ def user(): """ global __user if not __user: - if config.has_option('user', 'name') \ - and config.has_option('user', 'email'): - __user = Person(config.get('user', 'name'), - config.get('user', 'email')) + name=config.get('user.name') + email=config.get('user.email') + if name and email: + __user = Person(name, email) else: raise GitException, 'unknown user details' return __user; @@ -688,6 +688,8 @@ def status(files = None, modified = False, new = False, deleted = False, cache_files = [x for x in cache_files if x[0] in filestat] for fs in cache_files: + if files and not fs[1] in files: + continue if all: print '%s %s' % (fs[0], fs[1]) else: @@ -816,7 +818,7 @@ def pull(repository = 'origin', refspec = None): if refspec: args.append(refspec) - if __run(config.get('stgit', 'pullcmd'), args) != 0: + if __run(config.get('stgit.pullcmd'), args) != 0: raise GitException, 'Failed "git-pull %s"' % repository def repack():