Hi Felipe,
On Sun, May 02, 2010 at 06:48:56PM -0400, Felipe Sateler wrote:
> Package: git-buildpackage
> Version: 0.4.65
> Severity: normal
>
> gbp-pull when it encounters a non-fast-forward pull, does not perform
> the pull and prints out Warning: Skipping non-fast forward of 'branch',
> use --force. It should also return with a non-zero exit status.
Like:
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)
Cheers,
-- Guido
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
