From dev-return-3077-archive-asf-public=cust-asf.ponee.io@druid.apache.org Fri Jan 15 22:06:31 2021 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-he-de.apache.org (mxout1-he-de.apache.org [95.216.194.37]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 53C80180654 for ; Fri, 15 Jan 2021 23:06:31 +0100 (CET) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-he-de.apache.org (ASF Mail Server at mxout1-he-de.apache.org) with SMTP id 81B72658FB for ; Fri, 15 Jan 2021 22:06:30 +0000 (UTC) Received: (qmail 74862 invoked by uid 500); 15 Jan 2021 22:06:29 -0000 Mailing-List: contact dev-help@druid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@druid.apache.org Delivered-To: mailing list dev@druid.apache.org Received: (qmail 74850 invoked by uid 99); 15 Jan 2021 22:06:29 -0000 Received: from spamproc1-he-de.apache.org (HELO spamproc1-he-de.apache.org) (116.203.196.100) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2021 22:06:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamproc1-he-de.apache.org (ASF Mail Server at spamproc1-he-de.apache.org) with ESMTP id B7B101FF39A for ; Fri, 15 Jan 2021 22:06:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamproc1-he-de.apache.org X-Spam-Flag: NO X-Spam-Score: -0.001 X-Spam-Level: X-Spam-Status: No, score=-0.001 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.2, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Authentication-Results: spamproc1-he-de.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-ec2-va.apache.org ([116.203.227.195]) by localhost (spamproc1-he-de.apache.org [116.203.196.100]) (amavisd-new, port 10024) with ESMTP id ig1DolH0CV1L for ; Fri, 15 Jan 2021 22:06:27 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.166.49; helo=mail-io1-f49.google.com; envelope-from=g.himanshu@gmail.com; receiver= Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by mx1-ec2-va.apache.org (ASF Mail Server at mx1-ec2-va.apache.org) with ESMTPS id 484A7BCBD2 for ; Fri, 15 Jan 2021 22:06:27 +0000 (UTC) Received: by mail-io1-f49.google.com with SMTP id d13so17857907ioy.4 for ; Fri, 15 Jan 2021 14:06:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=74GJze5gW/uNvJCoSYw2Dq0aARp7Typ2dolDdY3Y1q8=; b=ftqEqgQIkvzf58b4YqXpHaE0X/RbLt5ZtL92tgBNhzeyDzx0Zc001kcwOIweOdSxam aySXfyqUXYU8SWlkqyG+3ZrfegEJfQm2QJPZ24qXo2nAkQ10tfRLJrv6tVHN2YxacO/F Ia/1l5JrSpISBpANpXiuJw1K73AuS/MlW9fEauXa7+n+zOapH+imN9yE4WKD/eL+XLyD 8AlWeSnPLwH/Gi/FSgcdukX9q1s6pY/OvhPGQpkkpCnoyvobzWLR4lV20kRGcZFBGLjB OKD5fgTh1O2VcfcjvNuvhIvslaKA1R7JclBlo8loW4xHWMsgHVMaozkhSk9jEsQ92Gj1 eudA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=74GJze5gW/uNvJCoSYw2Dq0aARp7Typ2dolDdY3Y1q8=; b=ezEhMMp6m6T1nTwtckVP7kGcF/cBl4MLGa2SR4Akrbgv+fykfNO/j0wSaw8/XWoXyk 1bRdYKkHqUHvdPB7hQrzulB9RGTFrRY3A4erG6ouA3IVDAgsTTt8AnK0FZ55iF4CbJRJ MZ5jCNwfwOXuHrKLd+8xB7U8oFiXFmqxez1HhOx3ZOLV9L4+spFpQJSqtSY5t+wQRZM6 6VgR4GGcEVodk3v9M913qfdNY1zTIMjrWQaQrcyC1zEsILQM9BDOAVQylNCbe5LQs/RA G3MHBiH/SDSL0B3TTMn/kB2NpXwdmDm12bZi29RmAJ9NaTv/7lFJI+2pm8E6S/sTQIhL sDig== X-Gm-Message-State: AOAM531F1MW1DG0TOtACZwx26at+L3X6XlGTwlLdjzdC2oZuqlmrQowv 2k1rPu0wBOmJDJwHghul3XqDhBY1cnzhcUBezSecbVCrNcc= X-Google-Smtp-Source: ABdhPJzx4XBVO4iUYPAFFXeERTmWavUUAnZ0/SndJElz7ikgAVK4ZRl7i/CL0XZJREdl7JzZQIoliS3gAxju2Y/dPgU= X-Received: by 2002:a92:1a0d:: with SMTP id a13mr12526465ila.109.1610748385483; Fri, 15 Jan 2021 14:06:25 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Himanshu Date: Fri, 15 Jan 2021 14:06:14 -0800 Message-ID: Subject: Re: Forbidding forced git push To: dev@druid.apache.org Content-Type: multipart/alternative; boundary="00000000000056e13a05b8f79516" --00000000000056e13a05b8f79516 Content-Type: text/plain; charset="UTF-8" +1 for discouraging force push in the PRs since there is no way to enforce it. > clean commit history is not a big gain compared to how much it can make the review process worse, especially when the PR is big "commit history" of PR is destroyed anyways when we do "Squash and Merge" ... commit message in druid master is based on PR "title" ..... so maintaining nice/clean looking commit history in PR isn't important. We MUST certainly not do a force push in apache/druid:master, that could/should be enforced I think . Force push to release branches are tolerable in extreme circumstances like Clint described. I hope that makes sense. -- Himanshu On Fri, Jan 15, 2021 at 1:47 PM Clint Wylie wrote: > It seems like this will basically only affect release managers. > > I am maybe -1 since I have personally had to force push to a release branch > while making an RC, when I optimistically pushed the tags and then found a > mistake doing preflight checks before sending the artifacts out to vote. I > did this so that I didn't have to do something like jump from RC1 to RC3 > with a dead RC2 before it was even voted on. > > I find since github added > https://github.blog/changelog/2018-11-15-force-push-timeline-event/ that > force-pushes aren't that terrible to deal with during a review even, so > would probably personally be in favor of relaxing our soft policy on them, > but it seems like everyone else is opposed to them, so i think it is also > fine to keep the soft policy as is and adding the link to it to the PR > template. > > On Fri, Jan 15, 2021 at 1:26 PM Gian Merlino wrote: > > > Will this help for the (common) case where PR branches are in people's > > forks? > > > > On Fri, Jan 15, 2021 at 1:00 PM Jihoon Son wrote: > > > > > Hi all, > > > > > > The forced git push is usually used to make the commit history clean, > > which > > > I understand its importance. However, one of its downsides is, because > it > > > overwrites the commit history, we cannot tell the exact change between > > > commits while reviewing a PR. This increases the burden for reviewers > > > because they have to go through the entire PR again after a forced > push. > > > For the same reason, we are suggesting to not use it in our > > documentation ( > > > > > > > > > https://github.com/apache/druid/blob/master/CONTRIBUTING.md#if-your-pull-request-shows-conflicts-with-master > > > ), > > > but I don't believe this documentation is well read by many people (It > > is a > > > good doc, BTW. Maybe we should promote it more effectively). > > > > > > Since branch sharing doesn't usually happen for us (AFAIK, there has > been > > > no branch sharing so far), I think this is the biggest downside of > using > > > forced push. To me, clean commit history is not a big gain compared to > > how > > > much it can make the review process worse, especially when the PR is > big. > > > > > > So, I would like to suggest forbidding git forced push for the Druid > > > repository. It seems possible to disable it by creating an infra > ticket ( > > > > > > > > > https://issues.apache.org/jira/browse/INFRA-13613?jql=text%20~%20%22force%20push%22 > > > ). > > > I can do it if everyone agrees. > > > > > > Would like to hear what people think. > > > Jihoon > > > > > > --00000000000056e13a05b8f79516--