From fe821e2bec0df8611c2d0639a52baa8ddc84cc28 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Tue, 14 Mar 2017 08:26:12 +0100 Subject: GitRepository: use stdout as last resort if stderr is empty This e.g. gives: GitRepositoryError: Error running git commit: On branch master Untracked files: debian/ nothing added to commit but untracked files present Instead of GitRepositoryError: Error running git commit: --- gbp/git/repository.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gbp/git') diff --git a/gbp/git/repository.py b/gbp/git/repository.py index 75f2ebc7..f1cd15a3 100644 --- a/gbp/git/repository.py +++ b/gbp/git/repository.py @@ -239,7 +239,8 @@ class GitRepository(object): except Exception as excobj: raise GitRepositoryError("Error running git %s: %s" % (command, excobj)) if ret: - raise GitRepositoryError("Error running git %s: %s" % (command, stderr)) + detail = stderr or stdout + raise GitRepositoryError("Error running git %s: %s" % (command, detail)) def _cmd_has_feature(self, command, feature): """ -- cgit v1.2.3