From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Michael Heerdegen Newsgroups: gmane.emacs.devel Subject: Re: scratch branches in Gnu Elpa Date: Sat, 20 Oct 2018 00:14:57 +0200 Message-ID: <87k1md4m8u.fsf@web.de> References: <87woqfcfkn.fsf@web.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1539987235 6835 195.159.176.226 (19 Oct 2018 22:13:55 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 19 Oct 2018 22:13:55 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Oct 20 00:13:51 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gDd1i-0001fU-Cg for ged-emacs-devel@m.gmane.org; Sat, 20 Oct 2018 00:13:50 +0200 Original-Received: from localhost ([::1]:52890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDd3o-0004N8-Mz for ged-emacs-devel@m.gmane.org; Fri, 19 Oct 2018 18:16:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDd3A-0004Mr-1G for emacs-devel@gnu.org; Fri, 19 Oct 2018 18:15:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDd30-0000Hg-PG for emacs-devel@gnu.org; Fri, 19 Oct 2018 18:15:16 -0400 Original-Received: from mout.web.de ([212.227.15.4]:50331) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDd30-00008S-51 for emacs-devel@gnu.org; Fri, 19 Oct 2018 18:15:10 -0400 Original-Received: from drachen.dragon ([94.218.210.177]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MS29q-1g23Ek0mi2-00TBGJ; Sat, 20 Oct 2018 00:15:00 +0200 Original-Received: from drachen.dragon ([94.218.210.177]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MS29q-1g23Ek0mi2-00TBGJ; Sat, 20 Oct 2018 00:15:00 +0200 In-Reply-To: (Stefan Monnier's message of "Thu, 18 Oct 2018 21:07:16 -0400") X-Provags-ID: V03:K1:FDkC8pZKtRqRspfQ7/zjAQhFCpyr+7qXjZXFzk/FgPA2KN+tmOX SENReKBa+EmEq5my3sHAuNz7qmMtyirP1exusqtbMWlx5vPCv9PM+6O40gGe6GeXYrJ1A9N lqxBgzqFytAAR6T5McY0krAGVIfYXeNagCIJ/eXv7pf/JmjU+5qu+i/XmPdoftBzYuz2iCs IPFKcSZ3BA17ZgIIJMQhg== X-UI-Out-Filterresults: notjunk:1;V01:K0:bZL6h13qC6A=:CL2hb4BmUuB5Jwcuqgn81u i17JeYhW1X/uJQivbeIAUB9BeWjxb+90roBQBnoVKHGWDGBQn0D5yoxoA3YRVAcVmvQ42UWMv iMIt41n6wDp74BUsejKEWSfC/o9qEQmPm+gtTPxrK7BlzjzYJk4qVg6WeIeV5+pksii4Bq2LJ 4WGzSiRHA0MYGUtzMAsYvs/jsEj4f0rkF9LiTICifn8jH5dGRN3nA2MJQylqd9luUMr29np4/ Vv+sWEbzzzt5UYw/K8hJ/l515FfShVMlbt2QAv6YPft3JxmoetSBIe1+Wuon3QTRvT0d1esdh EEoFbBpSOGy8Q5bh/jJ0yvq8jDvhOEPz3AMrlRVLdRjAvUaf/5efNBcqFXSQR5cZe4L2WcnG9 7JZjvDDABZaLTqCUupLPgVd5a3zte8kCfTaT8iLurw8N5bHVXiRoCU7ZNSboPB3vbXnBQpKHk jqTI9jUmlJRH7Wc//97AP99x4RE4Uqx9qd+lsQQgd1gXeSur9Nht6btii5S/ugGxmfsKHXRLP wBwAYygnAfDc2wvo3HKKFyrgL7L0b786XcyTttzX352LYFPMNHzC+lXC+DaEt2vBQu/+gX7op NF2vbGluviD+6t+Z5x8jCPEr/eWymqdFnv83bNdN+aAq7Wq12R9+Qvm7GMorHUK5q6jh0TiFa Saf8TRFw6eAuFCPay3EZ1oYTTcrMeC/yYb4EEvBK82hWM0XK3Upm34Alk2F3YAcNSJsoBsWdS Ofz97Wz08lkbhK1SJ94/uzvg5YWashPcq9F+fb9+W3WJE0THI2z3MEVRP/U39LHqDPa9wMCe X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.15.4 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:230513 Archived-At: Stefan Monnier writes: > > when I add a branch under scratch/ in Gnu Elpa, I can do there what I > > want, right? I mean, including history rewriting stuff, in particular. > > Yes. Thanks, but the server denies non-fast-forward pushes of my scratch branch even when forced (log from Magit): | 1 git =E2=80=A6 push -v --force --no-verify origin scratch/mheerdegen-p= review\:refs/heads/scratch/mheerdegen-preview | Pushing to mheerdegen@git.sv.gnu.org:/srv/git/emacs/elpa.git | Writing objects: 100% (165/165), 105.27 KiB | 4.58 MiB/s, done. | Total 165 (delta 119), reused 9 (delta 5) | remote: error: denying non-fast-forward refs/heads/scratch/mheerdegen-pre= view (you should pull first) | To git.sv.gnu.org:/srv/git/emacs/elpa.git | ! [remote rejected] scratch/mheerdegen-preview -> scratch/mheerdegen= -preview (non-fast-forward) | error: failed to push some refs to 'mheerdegen@git.sv.gnu.org:/srv/git/em= acs/elpa.git' Why is that? While we are here: I use a pre-push hook script like the following to make pushing fail when a commit message starts with "WIP" (to protect me from myself). Sorry for my ignorance - how can I change this script so that /scratch branches are not treated (I'm not good in writing bash)? #+begin_src emacs-lisp remote=3D"$1" url=3D"$2" z40=3D0000000000000000000000000000000000000000 IFS=3D' ' while read local_ref local_sha remote_ref remote_sha do if [ "$local_sha" =3D $z40 ] then # Handle delete : else if [ "$remote_sha" =3D $z40 ] then # New branch, examine all commits range=3D"$local_sha" else # Update to existing branch, examine new commits range=3D"$remote_sha..$local_sha" fi # Check for WIP commit #commit=3D`git rev-list -n 1 --grep '^WIP' "$range"` commit=3D`git rev-list -n 1 --grep '^WIP' "$range"` if [ -n "$commit" ] then echo "Found WIP commit in $local_ref, not pushing" exit 1 fi fi done exit 0 #+end_src TIA, Michael.