Skip to content

Commit bba4782

Browse files
committed
Merge branch 'patch-1' of https://github.com/neeraju/GitPython into neeraju-patch-1
Conflicts: git/objects/submodule/base.py
2 parents 15081dc + 56ae34e commit bba4782

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

‎git/objects/submodule/base.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ class UpdateProgress(RemoteProgress):
6060
# mechanism which cause plenty of trouble of the only reason for packages and
6161
# modules is refactoring - subpackages shoudn't depend on parent packages
6262
class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin):
63-
6463
"""Implements access to a git submodule. They are special in that their sha
6564
represents a commit in the submodule's repository which is to be checked out
6665
at the path of this instance.
@@ -662,7 +661,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False):
662661
num_branches_with_new_commits = 0
663662
rrefs = remote.refs
664663
for rref in rrefs:
665-
num_branches_with_new_commits = len(mod.git.cherry(rref)) != 0
664+
num_branches_with_new_commits += len(mod.git.cherry(rref)) != 0
666665
# END for each remote ref
667666
# not a single remote branch contained all our commits
668667
if num_branches_with_new_commits == len(rrefs):

0 commit comments

Comments
 (0)