andrewschleifer/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix git-branch-merge

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2013-07-09 17:28:24 +02:00
parent ce27012d62
commit d6d56043ce
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -187,9 +187,8 @@ $(GIT_TAG_FILE):
@printf "Enter tag description for $(CHANGELOG_VERSION)> " @printf "Enter tag description for $(CHANGELOG_VERSION)> "
@read tagmessage; git tag "$(CHANGELOG_VERSION)" -m "$$tagmessage" @read tagmessage; git tag "$(CHANGELOG_VERSION)" -m "$$tagmessage"
#git-branch-merge: git-tag
git-branch-merge: git-branch-merge:
current=$$(git rev-parse --abbrev-ref HEAD) \ current=$$(git rev-parse --abbrev-ref HEAD); \
git checkout "$(GIT_DST_BRANCH)" && \ git checkout "$(GIT_DST_BRANCH)" && \
git merge "$(GIT_SRC_BRANCH)" && \ git merge "$(GIT_SRC_BRANCH)" && \
git checkout "$$current" git checkout "$$current"
@ -199,13 +198,15 @@ $(VERSION_FILE): .git/refs/heads/*
echo "VERSION = \"$$(git describe)\"" > $@ echo "VERSION = \"$$(git describe)\"" > $@
# Pub is Nico's "push to all git remotes" thing # Pub is Nico's "push to all git remotes" thing
# git-release is the better term pub:
git-release pub:
for remote in "" github sf; do \ for remote in "" github sf; do \
echo "Pushing to $$remote" \ echo "Pushing to $$remote" \
git push --mirror $$remote \ git push --mirror $$remote \
done done
git-release: git-tag git-branch-merge
make pub
################################################################################ ################################################################################
# pypi # pypi
# #