|
|
|
@ -3,7 +3,7 @@
|
|
|
|
|
|
|
|
|
|
# target git-branch-create-upstream-%: Create git BRANCH from upstream/% branch
|
|
|
|
|
.PHONY: git-branch-create-upstream-% |
|
|
|
|
git-branch-create-upstream-%: $(if $(DOCKER_RUN),myos-base) update-upstream |
|
|
|
|
git-branch-create-upstream-%: myos-user update-upstream |
|
|
|
|
$(RUN) git fetch --prune upstream
|
|
|
|
|
git rev-parse --verify $(BRANCH) >/dev/null 2>&1 \
|
|
|
|
|
&& $(or $(call WARNING,present branch,$(BRANCH)), true) \
|
|
|
|
@ -15,7 +15,7 @@ git-branch-create-upstream-%: $(if $(DOCKER_RUN),myos-base) update-upstream
|
|
|
|
|
|
|
|
|
|
# target git-branch-delete: Delete git BRANCH
|
|
|
|
|
.PHONY: git-branch-delete |
|
|
|
|
git-branch-delete: $(if $(DOCKER_RUN),myos-base) update-upstream |
|
|
|
|
git-branch-delete: myos-user update-upstream |
|
|
|
|
git rev-parse --verify $(BRANCH) >/dev/null 2>&1 \
|
|
|
|
|
&& $(RUN) git branch -d $(BRANCH) \
|
|
|
|
|
|| $(or $(call WARNING,no branch,$(BRANCH)), true)
|
|
|
|
@ -26,7 +26,7 @@ git-branch-delete: $(if $(DOCKER_RUN),myos-base) update-upstream
|
|
|
|
|
|
|
|
|
|
# target git-branch-merge-upstream-%: Merge git BRANCH into upstream/% branch
|
|
|
|
|
.PHONY: git-branch-merge-upstream-% |
|
|
|
|
git-branch-merge-upstream-%: $(if $(DOCKER_RUN),myos-base) update-upstream |
|
|
|
|
git-branch-merge-upstream-%: myos-user update-upstream |
|
|
|
|
git rev-parse --verify $(BRANCH) >/dev/null 2>&1
|
|
|
|
|
$(RUN) git checkout $(BRANCH)
|
|
|
|
|
$(RUN) git pull --ff-only upstream $(BRANCH)
|
|
|
|
@ -38,12 +38,12 @@ git-branch-merge-upstream-%: $(if $(DOCKER_RUN),myos-base) update-upstream
|
|
|
|
|
|
|
|
|
|
# target git-stash: git stash
|
|
|
|
|
.PHONY: git-stash |
|
|
|
|
git-stash: $(if $(DOCKER_RUN),myos-base) |
|
|
|
|
git-stash: myos-user |
|
|
|
|
$(if $(filter-out 0,$(STATUS)),$(RUN) git stash)
|
|
|
|
|
|
|
|
|
|
# target git-tag-create-upstream-%: Create git TAG to reference upstream/% branch
|
|
|
|
|
.PHONY: git-tag-create-upstream-% |
|
|
|
|
git-tag-create-upstream-%: $(if $(DOCKER_RUN),myos-base) update-upstream |
|
|
|
|
git-tag-create-upstream-%: myos-user update-upstream |
|
|
|
|
ifneq ($(words $(TAG)),0) |
|
|
|
|
$(RUN) git checkout $*
|
|
|
|
|
$(RUN) git pull --tags --prune upstream $*
|
|
|
|
@ -60,7 +60,7 @@ endif
|
|
|
|
|
|
|
|
|
|
# target git-tag-merge-upstream-%: Merge git TAG into upstream/% branch
|
|
|
|
|
.PHONY: git-tag-merge-upstream-% |
|
|
|
|
git-tag-merge-upstream-%: $(if $(DOCKER_RUN),myos-base) update-upstream |
|
|
|
|
git-tag-merge-upstream-%: myos-user update-upstream |
|
|
|
|
ifneq ($(words $(TAG)),0) |
|
|
|
|
$(RUN) git fetch --tags -u --prune upstream $*:$*
|
|
|
|
|
$(RUN) git checkout $*
|
|
|
|
@ -70,5 +70,5 @@ endif
|
|
|
|
|
|
|
|
|
|
# target git-unstash: git stash pop
|
|
|
|
|
.PHONY: git-unstash |
|
|
|
|
git-unstash: $(if $(DOCKER_RUN),myos-base) |
|
|
|
|
git-unstash: myos-user |
|
|
|
|
$(if $(filter-out 0,$(STATUS)),$(RUN) git stash pop)
|
|
|
|
|