Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing `make release` - amending a tagged commit makes the commit not…

… match the tag.
  • Loading branch information...
commit a3de7f322233ab2b17ad6a69ea56877e417057cd 1 parent 55d892a
@ljharb ljharb authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 Makefile
View
5 Makefile
@@ -20,6 +20,7 @@ endif
release: verify-tag
@ OLD_TAG=`git describe --abbrev=0 --tags` && \
- npm version "$(TAG)" && \
replace "$${OLD_TAG/v/}" "$(TAG)" -- nvm.sh install.sh README.markdown && \
- git commit --amend nvm.sh install.sh README.markdown package.json
+ git commit -m "v$(TAG)" nvm.sh install.sh README.markdown package.json && \
+ git tag "v$(TAG)"
+

3 comments on commit a3de7f3

@koenpunt

nvm version altered the version in package.json..

@ljharb
Collaborator

oops - i'll add it to the replace. The problem is that npm version creates a commit and a tag - once amended, the commit and tag aren't the same anymore.

@ljharb
Collaborator

Fixed in 5ec0cce

Please sign in to comment.
Something went wrong with that request. Please try again.