From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10162 invoked by alias); 9 Apr 2013 16:47:33 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 31247 Received: (qmail 29112 invoked from network); 9 Apr 2013 16:47:30 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 Received-SPF: pass (ns1.primenet.com.au: SPF record at ruderich.org designates 178.63.68.96 as permitted sender) Date: Tue, 9 Apr 2013 18:47:23 +0200 From: Simon Ruderich To: zsh-workers@zsh.org Subject: Re: version.h and ChangeLog Message-ID: <20130409164722.GA24778@ruderich.org> References: <130407103829.ZM487@torch.brasslantern.com> <20130407192324.5bde3a2b@pws-pc.ntlworld.com> <87bo9pnr1n.fsf@ft.bewatermyfriend.org> <20130408203413.43e20021@pws-pc.ntlworld.com> <20130408220207.4c02af51@pws-pc.ntlworld.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="=_zucker.schokokeks.org-21300-1365526043-0001-2" Content-Disposition: inline In-Reply-To: <20130408220207.4c02af51@pws-pc.ntlworld.com> User-Agent: Mutt/1.5.21 (2013-03-19) --=_zucker.schokokeks.org-21300-1365526043-0001-2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 08, 2013 at 10:02:07PM +0100, Peter Stephenson wrote: > By the way, are we guaranteed that the output of 'git describe --tags > --long' is the same for everyone that has pulled the same code from the > server (and doesn't have local changes)? If not, it would be worth a > bit of extra work to make it so: the whole point of the patchlevel is so > it consistently refers to a particular state of what's on the server for > reporting by users who are just tracking development. Yes. git describe --tags --long uses the current commit and the existing tags to create the string. If the user has the same commit (e.g. by running git pull to get the latest changes) then git describe will be the same. > Local changes are > really a special case here --- people developing the shell can be > assumed to be knowledgeable enough to make their own investigations --- > though if it's possible to indicate that there are changes not pushed to > the server in a way that sticks out, e.g. with something appended like > "-local-", that's useful, too. This is definitely looking like a > script. Local commits aren't treated any different. But it's easy to check because they don't exist in the official repository. Consider this $ZSH_PATCHLEVEL: zsh-5.0.2-51-g9e7696a (the g means Git and is not part of the sha1) which is from a local branch of mine: $ git branch --contains 9e7696a 2>/dev/null $ And from an official commit, zsh-5.0.2-58-ge619a73: $ git branch --contains e619a73 2>/dev/null * master $ Appending something like "-local-" is difficult because what's considered local depends on how Git is used. We could check "origin"/master but what if I call the remote branch "upstream"? Regards Simon --=20 + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9 --=_zucker.schokokeks.org-21300-1365526043-0001-2 Content-Type: application/pgp-signature; name="signature.asc" Content-Transfer-Encoding: 7bit Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCgAGBQJRZEYaAAoJEJL+/bfkTDL5KvgQAIln0RSDR4Gy6dM4nsccNiYS 36MQbQVbEgglIRyeSj4bwie1ymZCr3oOCVqntIW1UD1kpNkGY1E2JG1f/RCIm7Ki xM3OI+xbSt8/Je9CYNaqYpR7TJzonrlbdop5Uy/NIot6Almwct0bUUIGZV9IbwUi WEmquUoUqxkYM+7vJHTgcZ7UPczuFI4gD0qcD6vS/mpwfgQSKdJ0pkZxAQkQPdoW AKrv7sag4aKElzTgqSgNeJy3NVBlFwJ4kSIvhlAczLfeZw9Y1lHUeKbLbxirQnvy zjPXNX64vghl09LSgfgxgfftfVI5cfMhcISykvjtRenoxR6BVfNH5drs+iHYB9o+ 0dENKbfO66sFoIqjadsto6e7Y/SMuzZuKahqAVcJv9i2/wpPA2MR+1Hn20B5ewkY bj50c7mA6AeAc1BS2k6DOyiDC8MQz6FNJBdKkrYWcqjn4bNlFOxKPsvWck5HbSLk 4+4CEwm25nPD3R46mKEXMfyU5w6KtaS42rVKBIp7iOSRvy2RGzPNnyi31elLvyMX x2w6CFBg5Y17ilztelY3h3r97aUgidHAoU2h8jTFk/Vrvi2H5InmYU5u85l3qRap +5RbUGzsD1RW6WuvdVwQeRcv+DJskhZQP/hEr5RTO8akBzBZY/rROL9G6T1XFZyW yHxUI/i/b9dzYifjIvqb =AE1+ -----END PGP SIGNATURE----- --=_zucker.schokokeks.org-21300-1365526043-0001-2--