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

1 files changed, 14 insertions, 0 deletions

diff --git a/git/util.py b/git/util.py
index 30ccfa66..955d23de 100644
--- a/git/util.py
+++ b/git/util.py
@@ -15,6 +15,8 @@ import getpass
 
 # NOTE:  Some of the unused imports might be used/imported by others.
 # Handle once test-cases are back up and running.
+from exc import GitCommandError
+
 from gitdb.util import (
     make_sha, 
     LockedFD, 
@@ -117,6 +119,18 @@ def get_user_id():
     """:return: string identifying the currently active system user as name@node"""
     return "%s@%s" % (getpass.getuser(), platform.node())
 
+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
+
 #} END utilities
 
 #{ Classes