From f2e1f4f3106b6ba65fd93ebdb7d0dc171c1f8b45 Mon Sep 17 00:00:00 2001 From: j8takagi Date: Tue, 19 May 2026 16:55:45 +0900 Subject: [PATCH] =?utf8?q?git=E3=81=AE=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81?= =?utf8?q?=E5=90=8D=E3=81=8Cmaster=E3=81=8B=E3=82=89main=E3=81=AB=E5=A4=89?= =?utf8?q?=E3=82=8F=E3=81=A3=E3=81=9F=E3=81=93=E3=81=A8=E3=82=92=E5=8F=8D?= =?utf8?q?=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Makefile | 4 ++-- VERSION | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 29b1a15..d8b3b5c 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ VERSION := $(shell $(CAT) VERSION) VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION)) -MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master) +MAINGITREF := $(shell $(GIT) show-ref -s refs/heads/main) VERSIONFILES := include/version.h \ test/system/casl2_opt/opt_v/0.txt \ @@ -90,7 +90,7 @@ $(VERSIONFILES): VERSION @$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@ gittag: - if test `$(GIT) status -s | $(WC) -l` -gt 0; then $(ECHO) "Error: commit, first."; exit 1; fi; if test "$(VERSIONGITREF)" != "$(MASTERGITREF)"; then $(GIT) tag $(VERSION); fi + if test `$(GIT) status -s | $(WC) -l` -gt 0; then $(ECHO) "Error: commit, first."; exit 1; fi; if test "$(VERSIONGITREF)" != "$(MAINGITREF)"; then $(GIT) tag $(VERSION); fi copyright: $(SEDI) 's/Copyright (c) 2010-20[0-9][0-9]/Copyright (c) 2010-$(YEAR)/g' LICENSE README diff --git a/VERSION b/VERSION index c9a545e..ecc83b5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.5p29 +v0.5p30 -- 2.47.3