hardware config: fix git add logic #424
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 CI failure is related to a test case where we have git but the local repo is not git-tracked. I guess we should check if the local repo is git-tracked before failing? |
picnoir
force-pushed
the
pic/git
branch
3 times, most recently
from
188183a to
35f99c9
Compare
|
CI fixed. This is ready for review. |
Mic92
reviewed
Nov 15, 2024
| pushd "$(dirname "$hardwareConfigPath")" | ||
| git add --intent-to-add --force -- "$hardwareConfigPath" >/dev/null 2>&1 || true | ||
| popd | ||
| if git rev-parse --is-inside-work-tree >/dev/null; then |
There was a problem hiding this comment.
So does this mean users have to change into the repository for this to work?
I can imagine that users would do something like
nixos-anywhere --flake $HOME/git/my-config
There was a problem hiding this comment.
Riiight, I get the pushd/popd part now!
picnoir
force-pushed
the
pic/git
branch
2 times, most recently
from
b1d192d to
bae44b6
Compare
Fixing the git add hardware config logic in case the user provides a relative path. We're doing two things: 1. Failing loudly if we're in a git repo and the git add command fails. At that point, we already know git is in $PATH. If the git add fails, the evaluation will likely fail in a flake setting. Better fail early with a helpful git error message. 2. We're resolving the hardware config path in the CLI parsing layer to make sure this path has the meaning the user intented it to have.
|
@mergify queue |
✅ The pull request has been merged automaticallyThe pull request has been merged automatically at 548b4a9 |
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.
Fixing the git add hardware config logic in case the user provides a relative path. We're doing two things: