Merge branch 'patch-1' of https://github.com/neeraju/GitPython into neeraju-patch-1

Byron · Byron · commit bba4782dd85b · 2014-11-19T10:41:15.000+01:00
Conflicts:
	git/objects/submodule/base.py
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
@@ -60,7 +60,6 @@ class UpdateProgress(RemoteProgress):
 # mechanism which cause plenty of trouble of the only reason for packages and
 # modules is refactoring - subpackages shoudn't depend on parent packages
 class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
-
     """Implements access to a git submodule. They are special in that their sha
     represents a commit in the submodule's repository which is to be checked out
     at the path of this instance. 
@@ -662,7 +661,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False):
                     num_branches_with_new_commits = 0
                     rrefs = remote.refs
                     for rref in rrefs:
-                        num_branches_with_new_commits = len(mod.git.cherry(rref)) != 0
+                        num_branches_with_new_commits += len(mod.git.cherry(rref)) != 0
                     # END for each remote ref
                     # not a single remote branch contained all our commits
                     if num_branches_with_new_commits == len(rrefs):
