From b956ebfc138422aecb0e0dec0a603c3b8316a12e Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Tue, 10 Jan 2012 20:28:04 +0100
Subject: GitRepository.branch_contains: fix misplaced remote parameter

---
 gbp/git/repository.py       | 3 ++-
 tests/test_GitRepository.py | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 640cc88..fe40588 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -381,8 +381,9 @@ class GitRepository(object):
         @param remote: whether to check remote instead of local branches
         @type remote: C{bool}
         """
-        args = GitArgs('--contains')
+        args = GitArgs()
         args.add_true(remote, '-r')
+        args.add('--contains')
         args.add(commit)
 
         out, ret =  self.__git_getoutput('branch', args.args)
diff --git a/tests/test_GitRepository.py b/tests/test_GitRepository.py
index 50b733d..7eaae1e 100644
--- a/tests/test_GitRepository.py
+++ b/tests/test_GitRepository.py
@@ -117,6 +117,8 @@ def test_create_branch():
     >>> repo.create_branch("foo")
     >>> repo.branch_contains("foo", 'HEAD')
     True
+    >>> repo.branch_contains("doesnotexist", 'HEAD', remote=True)
+    False
     """
 
 def test_delete_branch():
-- 
cgit v1.2.3