diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-02-19 17:12:15 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-02-19 17:12:15 +0100 |
| commit | 0f5320e8171324a002d3769824152cf5166a21a2 (patch) | |
| tree | 80639ef3895bc554f8ae5fa32b5d46324c38b38c /git | |
| parent | 5ac93b1d7e0694ceb303ee72c312921a9b1588f4 (diff) | |
| download | gitpython-0f5320e8171324a002d3769824152cf5166a21a2.tar.gz | |
Fix flake8 issue.
It's new in the latest version of flake - thanks travis for letting me know.
Diffstat (limited to 'git')
| -rw-r--r-- | git/objects/submodule/base.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py index 82c465ac..9c1dc647 100644 --- a/git/objects/submodule/base.py +++ b/git/objects/submodule/base.py @@ -578,11 +578,13 @@ class Submodule(util.IndexObject, Iterable, Traversable): base_commit = mrepo.merge_base(mrepo.head.commit, hexsha) if len(base_commit) == 0 or base_commit[0].hexsha == hexsha: if force: - log.debug("Will force checkout or reset on local branch that is possibly in the future of" - + "the commit it will be checked out to, effectively 'forgetting' new commits") + msg = "Will force checkout or reset on local branch that is possibly in the future of" + msg += "the commit it will be checked out to, effectively 'forgetting' new commits" + log.debug(msg) else: - log.info("Skipping %s on branch '%s' of submodule repo '%s' as it contains " - + "un-pushed commits", is_detached and "checkout" or "reset", mrepo.head, mrepo) + msg = "Skipping %s on branch '%s' of submodule repo '%s' as it contains un-pushed commits" + msg %= (is_detached and "checkout" or "reset", mrepo.head, mrepo) + log.info(msg) may_reset = False # end handle force # end handle if we are in the future |