shellgit: Ensure the passed filepath to diff-index is interpreted as filepath #1367
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
…filepath Simplified, the code in the past was like this (data/roles/pe_primary.yaml is a random test file): `git diff-index -p HEAD data/roles/pe_primary.yaml` Which results in the following error if the file is tracked in git but was deleted locally: ``` $ git status HEAD detached at 3140475 Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) deleted: data/roles/pe_primary.yaml Untracked files: (use "git add <file>..." to include in what will be committed) .r10k-deploy.json .resource_types/ modules/ no changes added to commit (use "git add" and/or "git commit -a") $ git diff-index -p HEAD data/roles/pe_primary.yaml fatal: ambiguous argument 'data/roles/pe_primary.yaml': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' $ echo $? 128 ``` With adding `--` to the command, we ensure it's interpreted as path. This changes the exit code to 0. ``` $ git status HEAD detached at 3140475 Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) deleted: data/roles/pe_primary.yaml Untracked files: (use "git add <file>..." to include in what will be committed) .r10k-deploy.json .resource_types/ modules/ no changes added to commit (use "git add" and/or "git commit -a") $ git diff-index -p HEAD -- data/roles/pe_primary.yaml diff --git a/data/roles/pe_primary.yaml b/data/roles/pe_primary.yaml deleted file mode 100644 index b827047..0000000 --- a/data/roles/pe_primary.yaml +++ /dev/null @@ -1,48 +0,0 @@ ---- -classes: - - profiles::nftables $ echo $? 0 ``` Why do we do this change? This ensures r10k can properly handle checkouts that were modified.
kenyon
approved these changes
Nov 27, 2023
justinstoller
approved these changes
Nov 27, 2023
|
@bastelfreak , do you want us to do a 4.0.1 release with this change or do you want to wait a bit to see what else comes up? |
|
@justinstoller Please make a 4.0.1 release (and if that could be vendored in PE 2023 that would be awesome). |
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.
Simplified, the code in the past was like this
(data/roles/pe_primary.yaml is a random test file):
git diff-index -p HEAD data/roles/pe_primary.yamlWhich results in the following error if the file is tracked in git but
was deleted locally:
With adding
--to the command, we ensure it's interpreted as path.This changes the exit code to 0.