diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2014-11-15 16:19:24 +0100 | 
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2014-11-15 16:21:37 +0100 | 
| commit | ff13922f6cfb11128b7651ddfcbbd5cad67e477f (patch) | |
| tree | 9d999b14a7817b1ceeb23ddd1cded446ace9255c /git/remote.py | |
| parent | 9c39afa1f85f3293ad2ccef684ff62bf0a36e73c (diff) | |
| parent | f7ed51ba4c8416888f5744ddb84726316c461051 (diff) | |
| download | gitpython-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/remote.py')
| -rw-r--r-- | git/remote.py | 17 | 
1 files changed, 4 insertions, 13 deletions
| diff --git a/git/remote.py b/git/remote.py index b06c0686..75e88e43 100644 --- a/git/remote.py +++ b/git/remote.py @@ -24,7 +24,10 @@ from refs import (                      TagReference                  ) -from git.util import join_path +from git.util import ( +		join_path, +		finalize_process +	)  from gitdb.util import join  import re @@ -58,18 +61,6 @@ def digest_process_messages(fh, progress):      # END while file is not done reading      return dropped_lines -def finalize_process(proc): -    """Wait for the process (clone, fetch, pull or push) and handle its errors accordingly""" -    try: -        proc.wait() -    except GitCommandError,e: -        # if a push has rejected items, the command has non-zero return status -        # a return status of 128 indicates a connection error - reraise the previous one -        if proc.poll() == 128: -            raise -        pass -    # END exception handling -  def add_progress(kwargs, git, progress):      """Add the --progress flag to the given kwargs dict if supported by the       git command. If the actual progress in the given progress instance is not  | 
