diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2014-11-19 10:41:53 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2014-11-19 10:41:53 +0100 |
| commit | aedab26cc13ff23db73813b4443afd5dd07d5c44 (patch) | |
| tree | 6771742bf45fc1da1caa487608de8411846584e2 /git/objects/submodule/base.py | |
| parent | 15081dccc54090de3a091a656b56bb3dfc1d11c3 (diff) | |
| parent | bba4782dd85b16a8f58b817caa8c96b4852bb496 (diff) | |
| download | gitpython-experiment-2012.tar.gz | |
Merge branch 'neeraju-patch-1'experiment-2012
Diffstat (limited to 'git/objects/submodule/base.py')
| -rw-r--r-- | git/objects/submodule/base.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py index 2608f5db..6cb9ae9c 100644 --- a/git/objects/submodule/base.py +++ b/git/objects/submodule/base.py @@ -60,7 +60,6 @@ UPDWKTREE = UpdateProgress.UPDWKTREE # 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 @@ class Submodule(util.IndexObject, Iterable, Traversable, RepoAliasMixin): 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): |