Skip to content

Handling of relative submodule paths #875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Handling of relative submodule paths #875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion git/objects/submodule/root.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
)
from git.exc import InvalidGitRepositoryError
import git
import os

import logging

Expand Down Expand Up @@ -197,7 +198,13 @@ def update(self, previous_commit=None, recursive=True, force_remove=False, init=

if not dry_run:
assert nn not in [r.name for r in rmts]
smr = smm.create_remote(nn, sm.url)

# Handle relative urls
remoteUrl = sm.url
if sm.url.startswith('..'):
remoteUrl = os.path.join(repo.remotes.origin.url, sm.url)
# END handle relative url check
smr = smm.create_remote(nn, remoteUrl)
smr.fetch(progress=progress)

# If we have a tracking branch, it should be available
Expand Down