version upの修正

diff --git a/git.mk b/git.mk
index b39c55a95aef65cfb53a9a0f36244cbe73cb0f0c..b1c33787e28825941a7a06ac0004bcb67f3225ed 100644 (file)
--- a/git.mk
+++ b/git.mk
@@ -1,6 +1,7 @@
 CAT := cat
 EXPR := expr
 GIT := git
+GREP := grep
 PRINTF := printf
 SED := sed
 
@@ -14,18 +15,15 @@ gitpush___stamp: gittag___stamp
        $(GIT) push github main --tags
        $(GIT) rev-parse HEAD > $@
 
-gittag___stamp: commit___stamp
+gittag___stamp: version_up___stamp
        $(GIT) tag $(VERSION) main
        $(PRINTF) "%s\n" "$(VERSION)" > $@
 
-commit___stamp: version_up___stamp
-       $(GIT) add VERSION
-       $(GIT) commit -m "version up"
-       $(GIT) rev-parse HEAD >$@
-
 version_up___stamp: VERSION
        if [ -n "$$($(GIT) status -s)" ]; then $(PRINTF) "Error: commit, first.\n"; exit 1; fi
-       while $(GIT) rev-parse -q --verify $$($(CAT) VERSION) >/dev/null 2>&1; do $(PRINTF) "v%.1fp%02d\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >$<; done
+       $(GIT) tag --points-at main | $(GREP) -qx "$(VERSION)" || while $(GIT) rev-parse -q --verify $$($(CAT) VERSION) >/dev/null 2>&1; do $(PRINTF) "v%.1fp%02d\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >$<; done
+       $(GIT) add VERSION
+       $(GIT) commit -m "version up"
        $(CAT) $< >$@
 
 gitclean: