diff options
| author | Sverre Rabbelier <srabbelier@gmail.com> | 2011-07-16 15:03:31 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-19 11:17:47 -0700 |
| commit | 460d10262dae14b54123ff45e7548d872ff63983 (patch) | |
| tree | e1c53cb7ea5fdf097d80bf305731affdc7e09142 /git_remote_helpers/git/repo.py | |
| parent | 0fb56ce716090248ed4895aff69dd3953b00882f (diff) | |
| download | git-460d10262dae14b54123ff45e7548d872ff63983.tar.gz git-460d10262dae14b54123ff45e7548d872ff63983.tar.xz | |
git-remote-testgit: fix error handling
If fast-export did not complete successfully the error handling code
itself would error out.
This was broken in commit 23b093ee0 (Brandon Casey, Wed Jun 9 2010,
Remove python 2.5'isms). Revert that commit an introduce our own copy
of check_call in util.py instead.
Tested by changing 'if retcode' to 'if not retcode' temporarily.
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git_remote_helpers/git/repo.py')
| -rw-r--r-- | git_remote_helpers/git/repo.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git_remote_helpers/git/repo.py b/git_remote_helpers/git/repo.py index 58e1cdb56..acbf8d778 100644 --- a/git_remote_helpers/git/repo.py +++ b/git_remote_helpers/git/repo.py @@ -1,6 +1,9 @@ import os import subprocess +from git_remote_helpers.util import check_call + + def sanitize(rev, sep='\t'): """Converts a for-each-ref line to a name/value pair. """ @@ -53,9 +56,7 @@ class GitRepo(object): path = ".cached_revs" ofile = open(path, "w") - child = subprocess.Popen(args, stdout=ofile) - if child.wait() != 0: - raise CalledProcessError + check_call(args, stdout=ofile) output = open(path).readlines() self.revmap = dict(sanitize(i) for i in output) if "HEAD" in self.revmap: |