nixos/version: fix case where .git is a symlink #78058
Merged
+6
−4
Conversation
This file contains hidden or 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
fpletz
added
6.topic: nixos
ofborg
bot
added
the
8.has: module (update)
Before c9214c3 and 9d396d2 if .git is symlink the version would gracefully default to no git revision. With those changes an exception is thrown instead. This introduces a new function `pathIsGitRepo` that checks if `commitIdFromGitRepo` fails without error so we don't have to reimplement this logic again and can fail gracefully.
fpletz
force-pushed
the
nixos/version-gitdir-symlink
branch
from
dad866b to
46773a1
Compare
ofborg
bot
added
10.rebuild-darwin: 0
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.
Motivation for this change
Before c9214c3 and 9d396d2 if .git is symlink the version would gracefully default to no git revision. With those changes, an exception is thrown instead.
This introduces a new function
pathIsGitRepothat checks ifcommitIdFromGitRepofails without error so we don't have to reimplement this logic again and can fail gracefully.Things done
nix path-info -Sbefore and after)