diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-10-30 23:16:04 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-10-30 23:21:58 +0300 |
| commit | d206710c6f4d58ad0f34e76440e7645042023560 (patch) | |
| tree | a5a5bb2fae893b3bc6b36df9a19022eacac91a40 /acceptance-tests/versions.mk | |
| parent | a4b77da18743f3cc6468e7e221b70fbdc02becab (diff) | |
[acceptance-tests] Add prefix in commit message for the bump commit helper
Additionally remove 'git pull', it doesn't work when no tracking branch is set and I can easily pull myself if I want to.
Diffstat (limited to 'acceptance-tests/versions.mk')
| -rw-r--r-- | acceptance-tests/versions.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/acceptance-tests/versions.mk b/acceptance-tests/versions.mk index 3a16bce02d7..7864669b9ec 100644 --- a/acceptance-tests/versions.mk +++ b/acceptance-tests/versions.mk @@ -107,23 +107,20 @@ reset: __bump-version-%: @if [ "$(REV)" = "" ]; then echo "Usage: make bump-version-$* REV=<ref>"; exit 1; fi - @if [ "$(COMMIT)" = "1" ]; then git pull; fi python versions.py set-rev $* $(REV) - @if [ "$(COMMIT)" = "1" ]; then echo "Bump $* to pick up $(REV)." | git commit -F - $(CONFIG); fi + @if [ "$(COMMIT)" = "1" ]; then echo "[acceptance-tests] Bump $* to pick up $(REV)." | git commit -F - $(CONFIG); fi __bump-branch-%: @if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi @if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi - @if [ "$(COMMIT)" = "1" ]; then git pull; fi python versions.py set-branch $* $(BRANCH) python versions.py set-remote-branch $* $(REMOTE_BRANCH) - @if [ "$(COMMIT)" = "1" ]; then echo "Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(CONFIG); fi + @if [ "$(COMMIT)" = "1" ]; then echo "[acceptance-tests] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(CONFIG); fi __bump-current-version-%: - @if [ "$(COMMIT)" = "1" ]; then git pull; fi REV=$(shell cd $(TOP)/../$* && git log -1 --pretty=format:%H); \ python versions.py set-rev $* $$REV; \ - if [ "$(COMMIT)" = "1" ]; then echo "Bump $* to pick up $$REV:" | git commit -F - $(CONFIG); fi + if [ "$(COMMIT)" = "1" ]; then echo "[acceptance-tests] Bump $* to pick up $$REV:" | git commit -F - $(CONFIG); fi # Bump the given submodule to the revision given by the REV make variable # If COMMIT is 1, commit the change |