Commitbba4782

committed

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

Conflicts:git/objects/submodule/base.py

2 parents15081dc +56ae34e commitbba4782Copy full SHA for bba4782

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ class UpdateProgress(RemoteProgress):`
`60`	`60`	`# mechanism which cause plenty of trouble of the only reason for packages and`
`61`	`61`	`# modules is refactoring - subpackages shoudn't depend on parent packages`
`62`	`62`	`classSubmodule(util.IndexObject,Iterable,Traversable,RepoAliasMixin):`
`63`		`-`
`64`	`63`	`"""Implements access to a git submodule. They are special in that their sha`
`65`	`64`	`represents a commit in the submodule's repository which is to be checked out`
`66`	`65`	`at the path of this instance.`
`@@ -662,7 +661,7 @@ def remove(self, module=True, force=False, configuration=True, dry_run=False):`
`662`	`661`	`num_branches_with_new_commits=0`
`663`	`662`	`rrefs=remote.refs`
`664`	`663`	`forrrefinrrefs:`
`665`		`-num_branches_with_new_commits=len(mod.git.cherry(rref))!=0`
	`664`	`+num_branches_with_new_commits+=len(mod.git.cherry(rref))!=0`
`666`	`665`	`# END for each remote ref`
`667`	`666`	`# not a single remote branch contained all our commits`
`668`	`667`	`ifnum_branches_with_new_commits==len(rrefs):`

Comments

(0)