Skip to content

Commit

Permalink
Fixing make release - amending a tagged commit makes the commit not…
Browse files Browse the repository at this point in the history 
… match the tag.
  • Loading branch information
@ljharb
ljharb committed Jul 17, 2014
1 parent 55d892a commit a3de7f3
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nvm version altered the version in package.json..

@ljharb
Copy link
Member Author

@ljharb ljharb commented on a3de7f3 Jul 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Member Author

@ljharb ljharb commented on a3de7f3 Jul 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 5ec0cce

Please sign in to comment.