From a2dd58d8a72f05f7cbe2e041fd1a75242ec107d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 4 May 2010 08:58:57 +0200 Subject: Requests for non fast-forward updates should exit with a non-zero result Closes: #579997 --- gbp-pull | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gbp-pull b/gbp-pull index 0352d7c..71f6c0b 100755 --- a/gbp-pull +++ b/gbp-pull @@ -40,9 +40,11 @@ def fast_forward_branch(branch, repo, options): fast_forward = True else: print >>sys.stderr, "Warning: Skipping non-fast forward of '%s' - use --force" % branch + if fast_forward: repo.set_branch(branch) GitMerge(remote)() + return fast_forward def main(argv): changelog = 'debian/changelog' @@ -92,7 +94,8 @@ def main(argv): GitFetch()() for branch in branches: - fast_forward_branch(branch, repo, options) + if not fast_forward_branch(branch, repo, options): + retval = 2 if options.redo_pq: repo.set_branch(options.debian_branch) -- cgit v1.2.1