Fix annoying git fatal message #44
Merged
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
rjuju
reviewed
Apr 1, 2022
Makefile
Outdated
| @@ -28,11 +28,9 @@ $(EXTENSION)--$(EXTVERSION).sql: setup.sql | |||
| cat $^ > $@ | |||
|
|
|||
| # Prepare the package for PGXN submission | |||
| DISTVERSION := $(shell git tag -l | tail -n 1 | cut -d 'v' -f 2) | |||
| package: dist dist/$(EXTENSION)-$(DISTVERSION).zip | |||
| DISTVERSION = `git tag -l | tail -n 1 | cut -d 'v' -f 2` | |||
There was a problem hiding this comment.
IIUC The git fatal message is only avoided by the backslashes, but technically it's still executed.
I think it would be cleaner to remove it here and instead add something like that in the package rule (with some extra output to validate the content):
package: dist .git
+ $(eval DISTVERSION := $(shell git tag -l | tail -n 1 | cut -d 'v' -f 2))
+ $(info Generation zip file for version $(DISTVERSION)...)
git archive --format zip --prefix=$(EXTENSION)-${DISTVERSION}/ --output [...]
There was a problem hiding this comment.
Thanks. I force-pushed the modifications you suggested. Is the commit ok now?
rjuju
approved these changes
Apr 1, 2022
rjuju
approved these changes
Apr 1, 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.
No description provided.