From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id HL7ZJeH+TGFJNQAAgWs5BA (envelope-from ) for ; Fri, 24 Sep 2021 00:25:37 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8H3aIOH+TGFNUwAAbx9fmQ (envelope-from ) for ; Thu, 23 Sep 2021 22:25:37 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 11FBA1CFC9 for ; Fri, 24 Sep 2021 00:25:37 +0200 (CEST) Received: from localhost ([::1]:50668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTX9s-0006lX-7C for larch@yhetil.org; Thu, 23 Sep 2021 18:25:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTX8t-0006lA-ET for emacs-orgmode@gnu.org; Thu, 23 Sep 2021 18:24:35 -0400 Received: from out1.migadu.com ([2001:41d0:2:863f::]:34255) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTX8q-0007FK-FE for emacs-orgmode@gnu.org; Thu, 23 Sep 2021 18:24:35 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1632435868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=KXG1/fOhZ7JlvkbCmRIntbaOIQggT6ByL6iu7tmNXao=; b=C03T+7WT/6r+iL2hSMq/3emPNNgnP60q+q/qQSuv+vcyIbBkGRWjBr9kz8HCWY3T0WkccQ 3Wb4A9V1vqNnPNgDeasi5Gdtq9fDiqPviChca18QPpSZ60L8SBkLTUxGewjrqGy1T7WzPr 1EmFVG0uHlOzCIwhRmPjZP6YUrcZllh3Ox+ZhzowPrLDjzAVe+BKDDARJni8YBApmb/jmp BoUHixYmhkIIwd4okGA8UKcLXcQ9TfI+cnh1U+Uf3NjTQuI+soL+CKWt7b4IYvan8ocNKW ls061+W82mh14zBsVMD4cAA5qm/U7tjJIGQIxcP6/uhYJK/53ic/I6sbxOPVJw== From: Kyle Meyer To: No Wayman Subject: Re: Switching to new Git repositories In-Reply-To: <87y27nt29u.fsf@gmail.com> References: <87y27nt29u.fsf@gmail.com> Date: Thu, 23 Sep 2021 18:24:19 -0400 Message-ID: <87a6k33p7w.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2001:41d0:2:863f::; envelope-from=kyle@kyleam.com; helo=out1.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wtd@pobox.com, marcowahlsoft@gmail.com, emacs-orgmode@gnu.org, eibhear.geo@gmail.com Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632435937; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=KXG1/fOhZ7JlvkbCmRIntbaOIQggT6ByL6iu7tmNXao=; b=Z24kN5/ZWqyVBvfKD29PrFe38HzsRIf1Hk2ofn1q3uEyEbX0IWPvVvxo9rwRVC+X3nWmBi q+p0M5d8WbdFVq+1YCaAPbNFhihTCSquZmWNuUW4KVNbxXjVZjwhhheqqk+sMVGFw6a3Dj zXPbaMgOHoLRi9c2T3ZSLb649mOc/TJQrp3RJlJjG9BQ1MtEwKyaBR4DYPT/e+wKKFWKa3 I+OufApKnaKHdyMxi9m2DiAs/Ov+E4elihdkfOLz623MyDlx+Xjx5cyb+tB6nbTqI9gq9V ttSt1+gCeVSh4G9rSwpHAgZjY1CU/1kUHrsmAWfCMUyjDik0n4P92MvORmN/RQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632435937; a=rsa-sha256; cv=none; b=GrdrO1yrPMG4WWzV2qvwuQePXv9pylhUdCgGOcoiobu/F85PIISlubup/EuhSCP7okLemN n22YqQhVdq/XmjL7ZZfDsS6iS0yI2fYvLGaW986n3yeFsCis91ViInV8YkzAr6LxoDa6+S vMuwR5JSd+E7wVlaxEshKyX6cRK14SoW+Siy32ewLGjj3Aiistvjk2U2hQOVLpTb7+kg4F zK6Wkv+GQfirmCMR5ciyhBu/P2vekmzPM5xjdtLFsSpv8jLwwRcJCW52I50+C8HGXFdFH8 PYVYHkN7k+VCugZVVoOHrvszKjIbmmn3Q+bfoAcic5uXzvj3KTvM4XELkZu5Iw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kyleam.com header.s=key1 header.b=C03T+7WT; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: 0.11 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kyleam.com header.s=key1 header.b=C03T+7WT; dmarc=none; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 11FBA1CFC9 X-Spam-Score: 0.11 X-Migadu-Scanner: scn0.migadu.com X-TUID: FHjAYSgFcCER On 09/23/21 17:17:48 -0400, No Wayman wrote: >> Sounds like a weird issue. I don't think this 9.5-dev tag is >> something from the Org repo. > > There is a bug in mk/targets.mk introduced by 61336f80dc. Quoting that commit message for context: mk/targets.mk: Add version fallback for tag-less repos * mk/targets.mk (ORGVERSION, GITVERSION): Get version from lisp/org.el header if it can't be retrieved from git-describe. As of elpa.git's ee03829f90 (Finalize the new master branch, 2020-12-14), org-release and org-git-version are empty strings in https://elpa.gnu.org/packages/org-*.tar files. This is because the new setup executes `make autoloads info' in an elpa.git worktree with an Org branch checked out, but elpa.git of course doesn't have Org's release tags. Maintaining the org.el version header has been a point of contention in the past [1], but the header has been there for a while now. Use it to avoid the above elpa.git issue. In the case of the master branch, the org-release value generated in a tag-less repo will have a different version than the one from a regular repo because org.el's version header has a "-dev" suffix, but that's still better than an empty version. [...] > As others have pointed out, the new repository does not have tags. > As a fallback, org.el's version is read in it's header. > However, it looks like Kyle forgot to trim that string so we get > ORGVERSION set to "9.5-dev" instead of "9.5". I of course can't say for sure, but based on my commit message (in particular the last paragraph), it sounds like I was aware of the discrepancy but didn't realize it'd cause the downstream "Invalid version syntax" issue mentioned by Bill in . > This causes `org-version' to return an incorrect version string. > > The attached patch addresses the issue in the makefile. Thanks. > Subject: [PATCH] mk/targets.mk: Fix ORGVERSION in tag-less repos > > * mk/targets.mk (ORGVERSION, GITVERSION): properly generate ORGVERSION. I think it'd be better to say something more specific about the change rather than say "properly" and assume the reader knows what the writer has in mind. > Fix bug introduced 61336f80 which caused ORGVERSION to be generated as > "Major.Minor-dev" instead of "Major.Minor" in tag-less repos. Please say what the bug is. Can you give a sparse outline of the call chain for the error mentioned in Bill's message? > - ORGVERSION := $(shell $(BATCH) --eval "(require 'lisp-mnt)" \ > - --visit lisp/org.el --eval '(princ (lm-header "version"))') > - GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD) > + ORGVERSION := $(patsubst %-dev,%,$(shell $(BATCH) --eval "(require 'lisp-mnt)" \ > + --visit lisp/org.el --eval '(princ (lm-header "version"))')) > + GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD)) It looks like you've unintentionally added a ')' to the end of the GITVERSION line. Another approach would be to update org.el's version to contain something that still signals "-dev" but won't trigger the "Invalid version syntax" (which, based on grepping the Emacs repo, is signaled by version-to-list). But given that in the current setup a clone with tags wouldn't use the header version, stripping -dev for consistency sounds like the way to go.