return abspath in read_git_file for submodule #675
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xieofxie
force-pushed
the
fix-opensubmodule
branch
from
5670d3d
to
df84117
Compare
davvid
requested changes
Apr 2, 2017
| @@ -67,6 +67,9 @@ def read_git_file(path): | |||
| data = core.read(path).strip() | |||
| if data.startswith(header): | |||
| result = data[len(header):] | |||
| if result and not os.path.isabs(result): | |||
| path_folder = os.path.dirname(path) | |||
| result = os.path.join(path_folder, result) | |||
There was a problem hiding this comment.
I think we'd only want to do this inside the same if data.startswith(header) block, since that's the only one which ever sets result, so this seems like it should be indented in two levels as a starting point.
Do you happen to have a reproduction recipe showing the problem? I'd like to test this on a test repo locally, maybe as a starting point for a test case.
The commit message should explain why we would want to return an absolute path rather than echoing what the code is already saying; it's better to say something that the code cannot.
The Ctrl+m amend mode in cola's commit editor can be used to revise the commit.
davvid
added a commit
to davvid/git-cola
that referenced
this pull request
Apr 10, 2017
* xieofxie/fix-opensubmodule: return abspath in read_git_file for submodule Signed-off-by: David Aguilar <davvid@gmail.com>
davvid
added a commit
to davvid/git-cola
that referenced
this pull request
Apr 10, 2017
Related-to: git-cola#675 Signed-off-by: David Aguilar <davvid@gmail.com>
davvid
added a commit
to davvid/git-cola
that referenced
this pull request
Apr 10, 2017
Related-to: git-cola#675 Signed-off-by: David Aguilar <davvid@gmail.com>
BarrettLowe
pushed a commit
to BarrettLowe/git-cola
that referenced
this pull request
Apr 16, 2017
Related-to: git-cola#675 Signed-off-by: David Aguilar <davvid@gmail.com>
BarrettLowe
pushed a commit
to BarrettLowe/git-cola
that referenced
this pull request
Apr 16, 2017
Related-to: git-cola#675 Signed-off-by: David Aguilar <davvid@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
should return an absolute path if a relative path is in the .git file of a submodule