[{"id":4301,"web_url":"https://patchwork.libcamera.org/comment/4301/","msgid":"<320b83dc-c665-86fb-2ff9-bce70a2c94eb@ideasonboard.com>","date":"2020-03-26T12:13:10","subject":"Re: [libcamera-devel] [PATCH] utils: hooks: Add pre-push commit hook","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 26/03/2020 11:49, Laurent Pinchart wrote:\n> Add a pre-push commit hooks to prevent unintentional push of patches\n> containing local changelogs to the master branch.\n> \n\nThanks this sounds like a useful check/addition.\n\nUnfortunately due to lacking a .sh extension, checkstyle.py did not run\nshell-check on this for you ...\n\n\n> Signed-off-by: Laurent Pinchart \n> ---\n> utils/hooks/pre-push | 59 ++++++++++++++++++++++++++++++++++++++++++++\n> 1 file changed, 59 insertions(+)\n> create mode 100755 utils/hooks/pre-push\n> \n> diff --git a/utils/hooks/pre-push b/utils/hooks/pre-push\n> new file mode 100755\n> index 000000000000..dc054b2553ff\n> --- /dev/null\n> +++ b/utils/hooks/pre-push\n> @@ -0,0 +1,59 @@\n> +#!/bin/sh\n> +\n> +# A hook script to verify what is about to be pushed. Called by \"git\n> +# push\" after it has checked the remote status, but before anything has been\n> +# pushed. If this script exits with a non-zero status nothing will be pushed.\n> +#\n> +# This hook is called with the following parameters:\n> +#\n> +# $1 -- Name of the remote to which the push is being done\n> +# $2 -- URL to which the push is being done\n> +#\n> +# If pushing without using a named remote those arguments will be equal.\n> +#\n> +# Information about the commits which are being pushed is supplied as lines to\n> +# the standard input in the form:\n> +#\n> +# \n> +#\n> +# This script prevents push of commits than contain a local changelog to the\n> +# master branch.\n> +\n> +remote=\"$1\"\n> +url=\"$2\"\n\n\nIn ./utils/hooks/pre-push line 22:\nremote=\"$1\"\n^-- SC2034: remote appears unused. Verify use (or export if used\nexternally).\n\nIn ./utils/hooks/pre-push line 23:\nurl=\"$2\"\n^-- SC2034: url appears unused. Verify use (or export if used externally).\n\n\nBut these are indeed 'unused' - but probably not needed, though useful\nreference.\n\n\n> +\n> +z40=0000000000000000000000000000000000000000\n> +\n> +while read local_ref local_sha remote_ref remote_sha\n\n\nIn ./utils/hooks/pre-push line 27:\nwhile read local_ref local_sha remote_ref remote_sha\n ^-- SC2162: read without -r will mangle backslashes.\n\n\n> +do\n> +\tif [ \"$remote_ref\" != refs/heads/master ]\n> +\tthen\n> +\t\tcontinue\n> +\tfi\n> +\n> +\tif [ \"$local_sha\" = $z40 ]\n> +\tthen\n> +\t\t# Handle delete\n> +\t\t:\n> +\telse\n> +\t\tif [ \"$remote_sha\" = $z40 ]\n> +\t\tthen\n> +\t\t\t# New branch, examine all commits\n> +\t\t\trange=\"$local_sha\"\n> +\t\telse\n> +\t\t\t# Update to existing branch, examine new commits\n> +\t\t\trange=\"$remote_sha..$local_sha\"\n> +\t\tfi\n> +\n> +\t\t# Check for WIP commit\n> +\t\tcommit=`git rev-list -n 1 --grep '^---' \"$range\"`\n\n\n\nIn ./utils/hooks/pre-push line 49:\n\t\tcommit=`git rev-list -n 1 --grep '^---' \"$range\"`\n ^-- SC2006: Use $(..) instead of legacy `..`.\n\n\n\n> +\t\tif [ -n \"$commit\" ]\n> +\t\tthen\n> +\t\t\techo >&2 \"Found local changelog in $local_ref, not pushing\"\n> +\t\t\techo >&2 \"Check commit $commit\"\n> +\t\t\texit 1\n> +\t\tfi\n\nIt might be interesting to do some last minute call to checkstyle.py\nhere too ... (with an optional manual accept if it flags anything).\n\nBut that is feature creep and can be outside of this patch.\n\n\n\n\n\n> +\tfi\n> +done\n> +\n> +exit 0\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D992960410\n\tfor ;\n\tThu, 26 Mar 2020 13:13:13 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6E3402DC;\n\tThu, 26 Mar 2020 13:13:13 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"QjD+bkjm\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1585224793;\n\tbh=Bm5hJW1W7iqIjuZYGokDCpU6+2XrJLx8If2gIOW5Pso=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=QjD+bkjmJkg9Ozf8brXo3k6Uf24uEeqRJrg1mDTHCYDml8ljeOQnGcCYpoo+MC+Kq\n\t7awWvnRz04tivt8yJ5FTc2BHb+akrJwpFlsgNW6mA8bOoO1ZkVhR2CCG7hbPrv8Kb5\n\te7GTntxDZqQVRuOywqlpD3iQ+CCVmtTcUFWrK0Wk=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200326114920.4716-1-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<320b83dc-c665-86fb-2ff9-bce70a2c94eb@ideasonboard.com>","Date":"Thu, 26 Mar 2020 12:13:10 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200326114920.4716-1-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH] utils: hooks: Add pre-push commit hook","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 26 Mar 2020 12:13:14 -0000"}},{"id":4303,"web_url":"https://patchwork.libcamera.org/comment/4303/","msgid":"<20200326132925.GN20581@pendragon.ideasonboard.com>","date":"2020-03-26T13:29:25","subject":"Re: [libcamera-devel] [PATCH] utils: hooks: Add pre-push commit hook","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Thu, Mar 26, 2020 at 12:13:10PM +0000, Kieran Bingham wrote:\n> On 26/03/2020 11:49, Laurent Pinchart wrote:\n> > Add a pre-push commit hooks to prevent unintentional push of patches\n> > containing local changelogs to the master branch.\n> \n> Thanks this sounds like a useful check/addition.\n> \n> Unfortunately due to lacking a .sh extension, checkstyle.py did not run\n> shell-check on this for you ...\n\nOops :-/ I could add a .sh extension, but that would be a bit less\nuser-friendly.\n\n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > utils/hooks/pre-push | 59 ++++++++++++++++++++++++++++++++++++++++++++\n> > 1 file changed, 59 insertions(+)\n> > create mode 100755 utils/hooks/pre-push\n> > \n> > diff --git a/utils/hooks/pre-push b/utils/hooks/pre-push\n> > new file mode 100755\n> > index 000000000000..dc054b2553ff\n> > --- /dev/null\n> > +++ b/utils/hooks/pre-push\n> > @@ -0,0 +1,59 @@\n> > +#!/bin/sh\n> > +\n> > +# A hook script to verify what is about to be pushed. Called by \"git\n> > +# push\" after it has checked the remote status, but before anything has been\n> > +# pushed. If this script exits with a non-zero status nothing will be pushed.\n> > +#\n> > +# This hook is called with the following parameters:\n> > +#\n> > +# $1 -- Name of the remote to which the push is being done\n> > +# $2 -- URL to which the push is being done\n> > +#\n> > +# If pushing without using a named remote those arguments will be equal.\n> > +#\n> > +# Information about the commits which are being pushed is supplied as lines to\n> > +# the standard input in the form:\n> > +#\n> > +# \n> > +#\n> > +# This script prevents push of commits than contain a local changelog to the\n> > +# master branch.\n> > +\n> > +remote=\"$1\"\n> > +url=\"$2\"\n> \n> In ./utils/hooks/pre-push line 22:\n> remote=\"$1\"\n> ^-- SC2034: remote appears unused. Verify use (or export if used\n> externally).\n> \n> In ./utils/hooks/pre-push line 23:\n> url=\"$2\"\n> ^-- SC2034: url appears unused. Verify use (or export if used externally).\n> \n> \n> But these are indeed 'unused' - but probably not needed, though useful\n> reference.\n> \n> > +\n> > +z40=0000000000000000000000000000000000000000\n> > +\n> > +while read local_ref local_sha remote_ref remote_sha\n> \n> \n> In ./utils/hooks/pre-push line 27:\n> while read local_ref local_sha remote_ref remote_sha\n> ^-- SC2162: read without -r will mangle backslashes.\n\nAll these come straight from the example pre-push hook from git. I'll\nstill fix them, but if we depart from the original, I'll take that as an\nopportunity to remove more unneeded code.\n\n> > +do\n> > +\tif [ \"$remote_ref\" != refs/heads/master ]\n> > +\tthen\n> > +\t\tcontinue\n> > +\tfi\n> > +\n> > +\tif [ \"$local_sha\" = $z40 ]\n> > +\tthen\n> > +\t\t# Handle delete\n> > +\t\t:\n> > +\telse\n> > +\t\tif [ \"$remote_sha\" = $z40 ]\n> > +\t\tthen\n> > +\t\t\t# New branch, examine all commits\n> > +\t\t\trange=\"$local_sha\"\n> > +\t\telse\n> > +\t\t\t# Update to existing branch, examine new commits\n> > +\t\t\trange=\"$remote_sha..$local_sha\"\n> > +\t\tfi\n> > +\n> > +\t\t# Check for WIP commit\n> > +\t\tcommit=`git rev-list -n 1 --grep '^---' \"$range\"`\n> \n> In ./utils/hooks/pre-push line 49:\n> \t\tcommit=`git rev-list -n 1 --grep '^---' \"$range\"`\n> ^-- SC2006: Use $(..) instead of legacy `..`.\n> \n> > +\t\tif [ -n \"$commit\" ]\n> > +\t\tthen\n> > +\t\t\techo >&2 \"Found local changelog in $local_ref, not pushing\"\n> > +\t\t\techo >&2 \"Check commit $commit\"\n> > +\t\t\texit 1\n> > +\t\tfi\n> \n> It might be interesting to do some last minute call to checkstyle.py\n> here too ... (with an optional manual accept if it flags anything).\n> \n> But that is feature creep and can be outside of this patch.\n> \n> > +\tfi\n> > +done\n> > +\n> > +exit 0","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 768A660410\n\tfor ;\n\tThu, 26 Mar 2020 14:29:29 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E10832DC;\n\tThu, 26 Mar 2020 14:29:28 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Pvu2RF4t\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1585229369;\n\tbh=SWMrBcyr6VIVHQcGL8acidSIFEm1idnvETEcwPCDKT0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Pvu2RF4tvboZHW8/uTpUF6tY9Hn0WYNlY4iaie2CEJMWrlfNLKadLvyX6VK0Tna9i\n\tZRi4nJzB+LqhvHGVgwjpW03Ssm7Yws3c68v4aXqZ0EsEOIyoaPivTHVgK0FbsmQQFG\n\tkerNvpUj40mpmXEFHTRWwLE6+cmgBbU9lwe7GqIk=","Date":"Thu, 26 Mar 2020 15:29:25 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200326132925.GN20581@pendragon.ideasonboard.com>","References":"<20200326114920.4716-1-laurent.pinchart@ideasonboard.com>\n\t<320b83dc-c665-86fb-2ff9-bce70a2c94eb@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<320b83dc-c665-86fb-2ff9-bce70a2c94eb@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH] utils: hooks: Add pre-push commit hook","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 26 Mar 2020 13:29:29 -0000"}}]