project.py: fix west diff --manifest to use manifest-rev
#748
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
Fixes new `west diff --manifest` option added by commit 0d5ee4e ("app: project: Allow to diff against manifest revision") Do not pass `project.revision` to `git diff` because `project.revision` is unresolved user input and does not always resolve to a commit. For instance, `project.revision` can be the name of a remote branch like `v3.7-branch` that does not exist locally; then `git diff` fails. Or even worse: there could be a local branch of the same name which points to a totally different commit. This bug was found when discussing issue zephyrproject-rtos#747, see 7th comment there for a longer description of what `manifest-rev` is and how it works. Signed-off-by: Marc Herbert <[email protected]>
pdgendt
approved these changes
Oct 9, 2024
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.
Fixes new
west diff --manifestoption added by commit 0d5ee4e ("app: project: Allow to diff against manifest revision")Do not pass
project.revisiontogit diffbecauseproject.revisionis unresolved user input and does not always resolve to a commit. For instance,project.revisioncan be the name of a remote branch likev3.7-branchthat does not exist locally; thengit difffails. Or even worse: there could be a local branch of the same name which points to a totally different commit.This bug was found when discussing issue #747, see 7th comment there for a longer description of what
manifest-revis and how it works.