diff options
| -rw-r--r-- | git/objects/submodule/base.py | 2 | ||||
| -rw-r--r-- | git/objects/submodule/root.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py index 97973a57..e929f9da 100644 --- a/git/objects/submodule/base.py +++ b/git/objects/submodule/base.py @@ -538,7 +538,7 @@ class Submodule(IndexObject, Iterable, Traversable): mrepo.head.set_reference(local_branch, logmsg="submodule: attaching head to %s" % local_branch) mrepo.head.ref.set_tracking_branch(remote_branch) except (IndexError, InvalidGitRepositoryError): - log.warn("Failed to checkout tracking branch %s", self.branch_path) + log.warning("Failed to checkout tracking branch %s", self.branch_path) # END handle tracking branch # NOTE: Have to write the repo config file as well, otherwise diff --git a/git/objects/submodule/root.py b/git/objects/submodule/root.py index f2035e5b..0af48710 100644 --- a/git/objects/submodule/root.py +++ b/git/objects/submodule/root.py @@ -265,7 +265,7 @@ class RootModule(Submodule): # this way, it will be checked out in the next step # This will change the submodule relative to us, so # the user will be able to commit the change easily - log.warn("Current sha %s was not contained in the tracking\ + log.warning("Current sha %s was not contained in the tracking\ branch at the new remote, setting it the the remote's tracking branch", sm.hexsha) sm.binsha = rref.commit.binsha # END reset binsha |