[{"id":4587,"web_url":"https://patchwork.libcamera.org/comment/4587/","msgid":"<20200427223627.GA1165729@oden.dyn.berto.se>","date":"2020-04-27T22:36:27","subject":"Re: [libcamera-devel] [PATCH] utils: hooks: pre-push: Catch commits\n\twithout committer's SoB","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your patch.\n\nOn 2020-04-27 01:23:23 +0300, Laurent Pinchart wrote:\n> Improve the pre-push git hook script to reject commits without the\n> committer's Signed-off-by line.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> utils/hooks/pre-push | 31 +++++++++++++++++++++++++++----\n> 1 file changed, 27 insertions(+), 4 deletions(-)\n> \n> diff --git a/utils/hooks/pre-push b/utils/hooks/pre-push\n> index 34906ddee5ed..0eb8f5ce193d 100755\n> --- a/utils/hooks/pre-push\n> +++ b/utils/hooks/pre-push\n> @@ -32,12 +32,35 @@ do\n> \t\trange=\"$remote_sha..$local_sha\"\n> \tfi\n> \n> +\t#\n> \t# Find invalid commits.\n> -\tcommit=$(git rev-list -n 1 --grep '^---' \"$range\")\n> -\tif [ -n \"$commit\" ]\n> +\t#\n> +\terrors=0\n> +\tfor commit in $(git rev-list \"$range\")\n> +\tdo\n> +\t\tmsg=$(git cat-file commit \"$commit\")\n> +\n> +\t\t# 1. The commit message shall not contain a local changelog.\n> +\t\tif echo \"$msg\" | grep -q '^--- *$'\n\nThis sends cold down my spine, too many times have I been bitten by \ntrying to check the 'sum' of piped return codes in sh if statements.\n\n$ if true | false; then echo \"1\"; else echo \"0\"; fi\n0\n$ if false | true; then echo \"1\"; else echo \"0\"; fi\n1\n\nIf we really wish to check the status piped commands in shell scripts \nplease switch this to #!/bin/bash and use 'set -o pipefail'.\n\n$ set -o pipefail\n$ if true | false; then echo \"1\"; else echo \"0\"; fi\n0\n$ if false | true; then echo \"1\"; else echo \"0\"; fi\n0\n\n> +\t\tthen\n> +\t\t\techo >&2 \"Found local changelog in commit $commit\"\n> +\t\t\terrors=$((errors+1))\n> +\t\tfi\n> +\n> +\t\t# 2. The commit message shall have a Signed-off-by line\n> +\t\t# corresponding the committer.\n> +\t\tcommitter=$(echo \"$msg\" | grep '^committer ' | head -1 | \\\n> +\t\t\t\tcut -d ' ' -f 2- | rev | cut -d ' ' -f 3- | rev)\n> +\t\tif ! echo \"$msg\" | grep -F -q \"Signed-off-by: ${committer}\"\n> +\t\tthen\n> +\t\t\techo >&2 \"Missing committer Signed-off-by in commit $commit\"\n> +\t\t\terrors=$((errors+1))\n> +\t\tfi\n> +\tdone\n> +\n> +\tif [ $errors != 0 ]\n> \tthen\n> -\t\techo >&2 \"Found local changelog in $local_ref, not pushing\"\n> -\t\techo >&2 \"Check commit $commit\"\n> +\t\techo >&2 \"Found $errors errors in $local_ref, not pushing\"\n> \t\texit 1\n> \tfi\n> done\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lf1-x144.google.com (mail-lf1-x144.google.com\n\t[IPv6:2a00:1450:4864:20::144])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B722060AF4\n\tfor ;\n\tTue, 28 Apr 2020 00:36:29 +0200 (CEST)","by mail-lf1-x144.google.com with SMTP id 198so15275193lfo.7\n\tfor ;\n\tMon, 27 Apr 2020 15:36:29 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tf2sm11025213lja.30.2020.04.27.15.36.28\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 27 Apr 2020 15:36:28 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com header.b=\"jXtusLo1\"; \n\tdkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=iWZ06rS03skpMZ2yzb8nMRMdBfMDU8JDip7sVmRK+To=;\n\tb=jXtusLo19UFktDMyj3FIdoWnwMCt9lfTbdNamMxgtOsCrD2V+lXS+0DpXuuzpbnWo0\n\tmLuJ/EaepVQ3Ej7wfHbhK6LQWDBQe7GmsglL3ayD3rXlccRtFWIJkvtvYa5iz7jYpALe\n\twH5LA6dpuim+WWmhvkUBctz7QQfFrsXeV8WS+S0Ne6ntYKzJVo+CiFrwp+sZxtV+vMHU\n\twTs3eDtyBsSDjKe/THbamQk7M7FluQ2HiBLOBEnvsQPSX7URwYAbkyXbR8aRSyWm3ueD\n\tdr1B6lUzN25wGCJohdaOZaISC+skFTVmY5ZsL6j5pvA0eGorCS9AfyyglIo6VXoMDwAj\n\tO/Fg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=iWZ06rS03skpMZ2yzb8nMRMdBfMDU8JDip7sVmRK+To=;\n\tb=rvM8MB+jtxy3k3w0ZyqNL7J+b0U6UeZABDtNDrGV6L7eZF6dyqP3tqhx+fTTD8erla\n\tVjXw30X48a/hBghw3cP3flIS6jjjiPeDmrMPHoyS8lry7qRGJ/t6A3uJwc7xgPexIf6z\n\tlOBl6Q/JGKiDu9ae/MxVJnd2UiU/xKjwDr0+vKW2KQwwAZEBIhQSraJb3v37MFjKUEiT\n\tp+h9CNcAwP5FsQJiII3FmDQp81Df2PW+Cm4n1PICjHtzpoAOTKRE0/JOsm4AodnhX7qp\n\tFDERXkP7YqTsBbPGLiUkr3T2xpaQtiewhLcpSF+L0LP+iGVGlk6/wWPa7DHwPHZP65xX\n\tkZJA==","X-Gm-Message-State":"AGi0PuZKj4aVYZZaM9IsUHbORPziWf5jJ5PgTfaSu5Vz0RpmDUIQ4ezB\n\tT/Cv2rhiyQkNjxLqUZXAbWbPjA==","X-Google-Smtp-Source":"APiQypJjjO7GZvTYmwBrKemL5Z6XJCOWyKHuf2XrJF6achZUmsKDMgGOy7Q6xijACqlp8Qkc012yig==","X-Received":"by 2002:a19:946:: with SMTP id 67mr17343356lfj.142.1588026988735;\n\tMon, 27 Apr 2020 15:36:28 -0700 (PDT)","Date":"Tue, 28 Apr 2020 00:36:27 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200427223627.GA1165729@oden.dyn.berto.se>","References":"<20200426222323.17245-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200426222323.17245-1-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] utils: hooks: pre-push: Catch commits\n\twithout committer's SoB","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":"Mon, 27 Apr 2020 22:36:30 -0000"}},{"id":4634,"web_url":"https://patchwork.libcamera.org/comment/4634/","msgid":"<20200429005623.GC16978@pendragon.ideasonboard.com>","date":"2020-04-29T00:56:23","subject":"Re: [libcamera-devel] [PATCH] utils: hooks: pre-push: Catch commits\n\twithout committer's SoB","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nOn Tue, Apr 28, 2020 at 12:36:27AM +0200, Niklas Söderlund wrote:\n> On 2020-04-27 01:23:23 +0300, Laurent Pinchart wrote:\n> > Improve the pre-push git hook script to reject commits without the\n> > committer's Signed-off-by line.\n> > \n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > utils/hooks/pre-push | 31 +++++++++++++++++++++++++++----\n> > 1 file changed, 27 insertions(+), 4 deletions(-)\n> > \n> > diff --git a/utils/hooks/pre-push b/utils/hooks/pre-push\n> > index 34906ddee5ed..0eb8f5ce193d 100755\n> > --- a/utils/hooks/pre-push\n> > +++ b/utils/hooks/pre-push\n> > @@ -32,12 +32,35 @@ do\n> > \t\trange=\"$remote_sha..$local_sha\"\n> > \tfi\n> > \n> > +\t#\n> > \t# Find invalid commits.\n> > -\tcommit=$(git rev-list -n 1 --grep '^---' \"$range\")\n> > -\tif [ -n \"$commit\" ]\n> > +\t#\n> > +\terrors=0\n> > +\tfor commit in $(git rev-list \"$range\")\n> > +\tdo\n> > +\t\tmsg=$(git cat-file commit \"$commit\")\n> > +\n> > +\t\t# 1. The commit message shall not contain a local changelog.\n> > +\t\tif echo \"$msg\" | grep -q '^--- *$'\n> \n> This sends cold down my spine, too many times have I been bitten by \n> trying to check the 'sum' of piped return codes in sh if statements.\n> \n> $ if true | false; then echo \"1\"; else echo \"0\"; fi\n> 0\n> $ if false | true; then echo \"1\"; else echo \"0\"; fi\n> 1\n> \n> If we really wish to check the status piped commands in shell scripts \n> please switch this to #!/bin/bash and use 'set -o pipefail'.\n> \n> $ set -o pipefail\n> $ if true | false; then echo \"1\"; else echo \"0\"; fi\n> 0\n> $ if false | true; then echo \"1\"; else echo \"0\"; fi\n> 0\n\nBut in this case I want to check the return value of grep, not \"summing\" the two.\n\n> > +\t\tthen\n> > +\t\t\techo >&2 \"Found local changelog in commit $commit\"\n> > +\t\t\terrors=$((errors+1))\n> > +\t\tfi\n> > +\n> > +\t\t# 2. The commit message shall have a Signed-off-by line\n> > +\t\t# corresponding the committer.\n> > +\t\tcommitter=$(echo \"$msg\" | grep '^committer ' | head -1 | \\\n> > +\t\t\t\tcut -d ' ' -f 2- | rev | cut -d ' ' -f 3- | rev)\n> > +\t\tif ! echo \"$msg\" | grep -F -q \"Signed-off-by: ${committer}\"\n> > +\t\tthen\n> > +\t\t\techo >&2 \"Missing committer Signed-off-by in commit $commit\"\n> > +\t\t\terrors=$((errors+1))\n> > +\t\tfi\n> > +\tdone\n> > +\n> > +\tif [ $errors != 0 ]\n> > \tthen\n> > -\t\techo >&2 \"Found local changelog in $local_ref, not pushing\"\n> > -\t\techo >&2 \"Check commit $commit\"\n> > +\t\techo >&2 \"Found $errors errors in $local_ref, not pushing\"\n> > \t\texit 1\n> > \tfi\n> > done","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 D6D2360AF5\n\tfor ;\n\tWed, 29 Apr 2020 02:56:24 +0200 (CEST)","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 4BFFA521;\n\tWed, 29 Apr 2020 02:56:24 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"GWYxrvQD\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1588121784;\n\tbh=rI3eud2gO2WyA4Yq19gBmU13dkodfFgY6AadEWdcpjU=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=GWYxrvQDjSOuYuUd14TOv6p34l0xGDXtZIdVpB+KGORzT/EhkNKJGsC9gcte8KFaj\n\tRNeJhfvn8J9Ej5hxIB/630SWJSJCs7GcnLA6Pm0VjDMxRr3l4itvByrQkt7otHFvXC\n\tVJZRGRObCOVn3HalryXd8emgAsF8tPGbNfaHf7zs=","Date":"Wed, 29 Apr 2020 03:56:23 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200429005623.GC16978@pendragon.ideasonboard.com>","References":"<20200426222323.17245-1-laurent.pinchart@ideasonboard.com>\n\t<20200427223627.GA1165729@oden.dyn.berto.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200427223627.GA1165729@oden.dyn.berto.se>","Subject":"Re: [libcamera-devel] [PATCH] utils: hooks: pre-push: Catch commits\n\twithout committer's SoB","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":"Wed, 29 Apr 2020 00:56:25 -0000"}},{"id":4635,"web_url":"https://patchwork.libcamera.org/comment/4635/","msgid":"<20200429010503.GF1372619@oden.dyn.berto.se>","date":"2020-04-29T01:05:03","subject":"Re: [libcamera-devel] [PATCH] utils: hooks: pre-push: Catch commits\n\twithout committer's SoB","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nOn 2020-04-29 03:56:23 +0300, Laurent Pinchart wrote:\n> Hi Niklas,\n> \n> On Tue, Apr 28, 2020 at 12:36:27AM +0200, Niklas Söderlund wrote:\n> > On 2020-04-27 01:23:23 +0300, Laurent Pinchart wrote:\n> > > Improve the pre-push git hook script to reject commits without the\n> > > committer's Signed-off-by line.\n> > > \n> > > Signed-off-by: Laurent Pinchart \n> > > ---\n> > > utils/hooks/pre-push | 31 +++++++++++++++++++++++++++----\n> > > 1 file changed, 27 insertions(+), 4 deletions(-)\n> > > \n> > > diff --git a/utils/hooks/pre-push b/utils/hooks/pre-push\n> > > index 34906ddee5ed..0eb8f5ce193d 100755\n> > > --- a/utils/hooks/pre-push\n> > > +++ b/utils/hooks/pre-push\n> > > @@ -32,12 +32,35 @@ do\n> > > \t\trange=\"$remote_sha..$local_sha\"\n> > > \tfi\n> > > \n> > > +\t#\n> > > \t# Find invalid commits.\n> > > -\tcommit=$(git rev-list -n 1 --grep '^---' \"$range\")\n> > > -\tif [ -n \"$commit\" ]\n> > > +\t#\n> > > +\terrors=0\n> > > +\tfor commit in $(git rev-list \"$range\")\n> > > +\tdo\n> > > +\t\tmsg=$(git cat-file commit \"$commit\")\n> > > +\n> > > +\t\t# 1. The commit message shall not contain a local changelog.\n> > > +\t\tif echo \"$msg\" | grep -q '^--- *$'\n> > \n> > This sends cold down my spine, too many times have I been bitten by \n> > trying to check the 'sum' of piped return codes in sh if statements.\n> > \n> > $ if true | false; then echo \"1\"; else echo \"0\"; fi\n> > 0\n> > $ if false | true; then echo \"1\"; else echo \"0\"; fi\n> > 1\n> > \n> > If we really wish to check the status piped commands in shell scripts \n> > please switch this to #!/bin/bash and use 'set -o pipefail'.\n> > \n> > $ set -o pipefail\n> > $ if true | false; then echo \"1\"; else echo \"0\"; fi\n> > 0\n> > $ if false | true; then echo \"1\"; else echo \"0\"; fi\n> > 0\n> \n> But in this case I want to check the return value of grep, not \"summing\" the two.\n\nAs discussed on IRC the problem with dash not supporting pipefail and \nthe unlikely event of echo failing I think the pragmatic thing to do is\n\nReviewed-by: Niklas Söderlund \n\n> \n> > > +\t\tthen\n> > > +\t\t\techo >&2 \"Found local changelog in commit $commit\"\n> > > +\t\t\terrors=$((errors+1))\n> > > +\t\tfi\n> > > +\n> > > +\t\t# 2. The commit message shall have a Signed-off-by line\n> > > +\t\t# corresponding the committer.\n> > > +\t\tcommitter=$(echo \"$msg\" | grep '^committer ' | head -1 | \\\n> > > +\t\t\t\tcut -d ' ' -f 2- | rev | cut -d ' ' -f 3- | rev)\n> > > +\t\tif ! echo \"$msg\" | grep -F -q \"Signed-off-by: ${committer}\"\n> > > +\t\tthen\n> > > +\t\t\techo >&2 \"Missing committer Signed-off-by in commit $commit\"\n> > > +\t\t\terrors=$((errors+1))\n> > > +\t\tfi\n> > > +\tdone\n> > > +\n> > > +\tif [ $errors != 0 ]\n> > > \tthen\n> > > -\t\techo >&2 \"Found local changelog in $local_ref, not pushing\"\n> > > -\t\techo >&2 \"Check commit $commit\"\n> > > +\t\techo >&2 \"Found $errors errors in $local_ref, not pushing\"\n> > > \t\texit 1\n> > > \tfi\n> > > done\n> \n> -- \n> Regards,\n> \n> Laurent Pinchart","headers":{"Return-Path":"","Received":["from mail-lj1-x242.google.com (mail-lj1-x242.google.com\n\t[IPv6:2a00:1450:4864:20::242])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8BD1F61AD4\n\tfor ;\n\tWed, 29 Apr 2020 03:05:05 +0200 (CEST)","by mail-lj1-x242.google.com with SMTP id f18so787749lja.13\n\tfor ;\n\tTue, 28 Apr 2020 18:05:05 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tr20sm776393ljj.44.2020.04.28.18.05.03\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 28 Apr 2020 18:05:03 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com header.b=\"d8PwsdQB\"; \n\tdkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=12KWtIWIq6Edz8XY1UHjWFAipP5tHnwrrRJ+KHsaqwc=;\n\tb=d8PwsdQB4PD7BUDgkWx9ozI4F9tlnMVFUdxVqUTCikcySlp+NMq6qIdp24wC7hdCHI\n\tckB5CW7Ld0DK8WCV1rzBHSpizb+tGyJnoYEsx7l3nKTuhl2bljmphykxiMejIX6MQxVQ\n\tRMg0maFs48vszrdWnRnbNuVVnITljzxggAYeRvz1VVn+UaYE6KhRWETniURct6iGLhd1\n\tUgQD5dWWYoPEEVZ8JUedrNcDlBSzacvXo6sm1msKbxkDBGuO8OYFPU0jjrZUmsZVeAVQ\n\t4UmZ7YprnfAhKszCZpgd1Cu4asiIAtlWymAT2fFAbcG57MyRIYdlL8pGl/+7XCL58B8y\n\tX66w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=12KWtIWIq6Edz8XY1UHjWFAipP5tHnwrrRJ+KHsaqwc=;\n\tb=p17nmtK6+pP72J7GbGW4+Mq6FbFyXNjXtXRMweWKBrQ7BLWsQgxU70VMK6bnvTCes2\n\t6TQxKN6wq5FpFr2SN66DG2ZgrW1/wwvoYj4afQKGfUTZ83VahztDw2wESD1GPbxHHQjz\n\tmnpFF4KLWhhCHCgSARao1VDTHhAb3ebtc8X574uOLFW1A1IpWxNiYJdHSZbsXG30595S\n\tij4f4EsYBcSuhgQJL53I66kUG/iSWVQ0qPD4b/sjdRR/7dpfkeNh2XZTLMFbu5QpE9Hv\n\teQu4pee8xVBZE/qOpMSVPmp2OoVoYJSUjKv6rB3NVGvXhGiOriz9T8LFo3MzfYwAzscu\n\tOlow==","X-Gm-Message-State":"AGi0PubHeaSkgWJdrgtGHedFYZbrWPt+cgu/7YV/K9vo2VZZ0CpVQ+nV\n\tf68SS5SvaiS9E/kmV5mE1rDbOuzviPw=","X-Google-Smtp-Source":"APiQypKtPUW0acT96PGo5y5f06pvImfeb3lfNtC5usl0gof/dtTEUFxhAsrAE7aDjtrpB/6dExocbw==","X-Received":"by 2002:a2e:6c16:: with SMTP id\n\th22mr17844930ljc.30.1588122304791; \n\tTue, 28 Apr 2020 18:05:04 -0700 (PDT)","Date":"Wed, 29 Apr 2020 03:05:03 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200429010503.GF1372619@oden.dyn.berto.se>","References":"<20200426222323.17245-1-laurent.pinchart@ideasonboard.com>\n\t<20200427223627.GA1165729@oden.dyn.berto.se>\n\t<20200429005623.GC16978@pendragon.ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200429005623.GC16978@pendragon.ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] utils: hooks: pre-push: Catch commits\n\twithout committer's SoB","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":"Wed, 29 Apr 2020 01:05:05 -0000"}},{"id":4648,"web_url":"https://patchwork.libcamera.org/comment/4648/","msgid":"<9c694ec7-b7f7-3498-1c13-bd4d508bc299@ideasonboard.com>","date":"2020-04-29T14:32:03","subject":"Re: [libcamera-devel] [PATCH] utils: hooks: pre-push: Catch commits\n\twithout committer's SoB","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/04/2020 23:23, Laurent Pinchart wrote:\n> Improve the pre-push git hook script to reject commits without the\n> committer's Signed-off-by line.\n> \n\nI see Niklas has some concerns about the potential pipe errors here, but\nas I've reviewed the patch that goes on top of this, I figure I should\nadd this here too:\n\nReviewed-by: Kieran Bingham \n\nI wonder when this will get turned into an extended python script ;-)\n\n\n\n> Signed-off-by: Laurent Pinchart \n> ---\n> utils/hooks/pre-push | 31 +++++++++++++++++++++++++++----\n> 1 file changed, 27 insertions(+), 4 deletions(-)\n> \n> diff --git a/utils/hooks/pre-push b/utils/hooks/pre-push\n> index 34906ddee5ed..0eb8f5ce193d 100755\n> --- a/utils/hooks/pre-push\n> +++ b/utils/hooks/pre-push\n> @@ -32,12 +32,35 @@ do\n> \t\trange=\"$remote_sha..$local_sha\"\n> \tfi\n> \n> +\t#\n> \t# Find invalid commits.\n> -\tcommit=$(git rev-list -n 1 --grep '^---' \"$range\")\n> -\tif [ -n \"$commit\" ]\n> +\t#\n> +\terrors=0\n> +\tfor commit in $(git rev-list \"$range\")\n> +\tdo\n> +\t\tmsg=$(git cat-file commit \"$commit\")\n> +\n> +\t\t# 1. The commit message shall not contain a local changelog.\n> +\t\tif echo \"$msg\" | grep -q '^--- *$'\n> +\t\tthen\n> +\t\t\techo >&2 \"Found local changelog in commit $commit\"\n> +\t\t\terrors=$((errors+1))\n> +\t\tfi\n> +\n> +\t\t# 2. The commit message shall have a Signed-off-by line\n> +\t\t# corresponding the committer.\n> +\t\tcommitter=$(echo \"$msg\" | grep '^committer ' | head -1 | \\\n> +\t\t\t\tcut -d ' ' -f 2- | rev | cut -d ' ' -f 3- | rev)\n> +\t\tif ! echo \"$msg\" | grep -F -q \"Signed-off-by: ${committer}\"\n> +\t\tthen\n> +\t\t\techo >&2 \"Missing committer Signed-off-by in commit $commit\"\n> +\t\t\terrors=$((errors+1))\n> +\t\tfi\n> +\tdone\n> +\n> +\tif [ $errors != 0 ]\n> \tthen\n> -\t\techo >&2 \"Found local changelog in $local_ref, not pushing\"\n> -\t\techo >&2 \"Check commit $commit\"\n> +\t\techo >&2 \"Found $errors errors in $local_ref, not pushing\"\n> \t\texit 1\n> \tfi\n> done\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2CDDC609D6\n\tfor ;\n\tWed, 29 Apr 2020 16:32:07 +0200 (CEST)","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 9BF1F521;\n\tWed, 29 Apr 2020 16:32:06 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"stMulVpS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1588170726;\n\tbh=40sp61bcTDKn9kmjkcvCGIHQJBDlXteJUJgkFPii268=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=stMulVpSh/3G8JtI6aGXCfJsQPHTJYX8RbLJ+j9QUUNNl3QLv9D2m2da1qXfzVJFt\n\tNq0NYcxOREXNVcJX9FcMp2cBLfyzWrVda5U3WgGazN/lv+UVb2esoLunyPnJSjfJcn\n\t/BHHemxKjfDszR+yxC4Q9ZcT1tFxBmM7DwFZOEnc=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200426222323.17245-1-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<9c694ec7-b7f7-3498-1c13-bd4d508bc299@ideasonboard.com>","Date":"Wed, 29 Apr 2020 15:32:03 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.7.0","MIME-Version":"1.0","In-Reply-To":"<20200426222323.17245-1-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH] utils: hooks: pre-push: Catch commits\n\twithout committer's SoB","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":"Wed, 29 Apr 2020 14:32:07 -0000"}}]