config: fix worktree git config dir path #775
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
The config code doesn't follow the worktree git config file when the user calls for a command that depends on that from within a `git worktree` directory. In this cases, the .git path is in fact a file instead of a valid directory, which turns to point to the actual worktree configuration dir. Instead of realying in a hardcoded path (`.git/lab`), make use of the `git rev-parse --git-dir` command already available in the git commands code (internal/git/git.go) and which follows the worktree situation. Signed-off-by: Bruno Meneguele <bmeneg@redhat.com>
Codecov Report
@@ Coverage Diff @@
## master #775 +/- ##
==========================================
+ Coverage 55.05% 55.08% +0.03%
==========================================
Files 77 77
Lines 5584 5588 +4
==========================================
+ Hits 3074 3078 +4
- Misses 2226 2227 +1
+ Partials 284 283 -1
Continue to review full report at Codecov.
|
prarit
approved these changes
Jan 12, 2022
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.
The config code doesn't follow the worktree git config file when the
user calls for a command that depends on that from within a
git worktreedirectory. In this cases, the .git path is in fact a fileinstead of a valid directory, which turns to point to the actual
worktree configuration dir.
Instead of realying in a hardcoded path (
.git/lab), make use of thegit rev-parse --git-dircommand already available in the git commandscode (internal/git/git.go) and which follows the worktree situation.
Signed-off-by: Bruno Meneguele bmeneg@redhat.com
Fixes #773