summaryrefslogtreecommitdiff
path: root/git/repo/base.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-11-15 16:19:24 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-11-15 16:21:37 +0100
commitff13922f6cfb11128b7651ddfcbbd5cad67e477f (patch)
tree9d999b14a7817b1ceeb23ddd1cded446ace9255c /git/repo/base.py
parent9c39afa1f85f3293ad2ccef684ff62bf0a36e73c (diff)
parentf7ed51ba4c8416888f5744ddb84726316c461051 (diff)
downloadgitpython-ff13922f6cfb11128b7651ddfcbbd5cad67e477f.tar.gz
Merge branch 'sf-master' of https://github.com/johnsca/GitPython into johnsca-sf-master
Conflicts: git/cmd.py git/objects/commit.py git/objects/fun.py git/objects/util.py git/remote.py git/repo/base.py git/test/lib/helper.py git/test/test_commit.py git/test/test_fun.py git/util.py
Diffstat (limited to 'git/repo/base.py')
-rw-r--r--git/repo/base.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/git/repo/base.py b/git/repo/base.py
index 933c8c82..6a311f0b 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -6,7 +6,10 @@
from git.exc import InvalidGitRepositoryError, NoSuchPathError
from git.cmd import Git
-from git.util import Actor
+from git.util import (
+ Actor,
+ finalize_process
+ )
from git.refs import *
from git.index import IndexFile
from git.objects import *
@@ -14,7 +17,6 @@ from git.config import GitConfigParser
from git.remote import (
Remote,
digest_process_messages,
- finalize_process,
add_progress
)
@@ -540,6 +542,7 @@ class Repo(object):
if filename[0] == filename[-1] == '"':
filename = filename[1:-1].decode('string_escape')
untracked_files.append(filename)
+ finalize_process(proc)
return untracked_files
@property