Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1B8582009F4 for ; Thu, 26 May 2016 17:45:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 19EB3160A18; Thu, 26 May 2016 15:45:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3DD40160A17 for ; Thu, 26 May 2016 17:45:10 +0200 (CEST) Received: (qmail 42837 invoked by uid 500); 26 May 2016 15:45:09 -0000 Mailing-List: contact dev-help@airflow.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airflow.incubator.apache.org Delivered-To: mailing list dev@airflow.incubator.apache.org Received: (qmail 42826 invoked by uid 99); 26 May 2016 15:45:09 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2016 15:45:09 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 0B0EE1A6169 for ; Thu, 26 May 2016 15:45:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -2.021 X-Spam-Level: X-Spam-Status: No, score=-2.021 tagged_above=-999 required=6.31 tests=[HTML_MESSAGE=2, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id xt6xp1q7luGi for ; Thu, 26 May 2016 15:45:05 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id B34595F2C2 for ; Thu, 26 May 2016 15:45:04 +0000 (UTC) Received: (qmail 42801 invoked by uid 99); 26 May 2016 15:45:03 -0000 Received: from mail-relay.apache.org (HELO mail-relay.apache.org) (140.211.11.15) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2016 15:45:03 +0000 Received: from mail-vk0-f52.google.com (mail-vk0-f52.google.com [209.85.213.52]) by mail-relay.apache.org (ASF Mail Server at mail-relay.apache.org) with ESMTPSA id 7AA5A1A0247 for ; Thu, 26 May 2016 15:45:03 +0000 (UTC) Received: by mail-vk0-f52.google.com with SMTP id c189so107536766vkb.1 for ; Thu, 26 May 2016 08:45:03 -0700 (PDT) X-Gm-Message-State: ALyK8tKwt3RMEtfyFtLmwfE5e/4Fshdag18hQ1elaPgFCWibBdqRt/Vkl+5f45Sw2Ka2WXShrFDKLUb7ME98Pw== X-Received: by 10.159.39.134 with SMTP id b6mr5808033uab.151.1464277502609; Thu, 26 May 2016 08:45:02 -0700 (PDT) MIME-Version: 1.0 References: <15A74339-E92F-4C09-A627-240CECD03157@gmail.com> In-Reply-To: From: Jeremiah Lowin Date: Thu, 26 May 2016 15:44:53 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Commit guidelines To: Jeremiah Lowin , dev@airflow.incubator.apache.org, Chris Riccomini Content-Type: multipart/alternative; boundary=94eb2c123cc665860f0533c0ac9d archived-at: Thu, 26 May 2016 15:45:11 -0000 --94eb2c123cc665860f0533c0ac9d Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable @Chris to be clear, what workflow would you like to see? I think trying to do this without a squash commit (in other words editing individual commit messages) could get messy since it would require managing a rebase through the PR tool... On Thu, May 26, 2016 at 11:36 AM Jeremiah Lowin wrote: > Yes it should be able to. Currently, if you tell the PR tool to squash > commits, it reattributes the author properly. So it should just be a matt= er > of adding a prompt for a new commit message. I will work on it. > > > On Wed, May 25, 2016 at 7:30 PM Chris Riccomini > wrote: > >> Also, @Jeremiah, is it possible to make the airflow-pr tool allow us to >> change commit messages? I couldn't figure out a way to do this without >> affecting the git author, which removes attribution. It's kind of a pain >> to >> keep having to nag contributors to follow the guidelines. >> >> On Wed, May 25, 2016 at 3:30 PM, Chris Riccomini >> wrote: >> >> > @Bolke, thanks for bringing this up. >> > >> > I wonder if it's possible to get a commit hook on our Apache repo to >> > prevent merges that don't follow at least some of the guidelines (e.g. >> > starts with [AIRFLOW-XXX], has a multi-line description). >> > >> > On Tue, May 24, 2016 at 8:55 AM, Maxime Beauchemin < >> > maximebeauchemin@gmail.com> wrote: >> > >> >> There's also been some unapproved PRs that have been rush-merged. If >> you >> >> feel a sense of urgency towards a PR making it in master or in a >> release, >> >> that's a sign that you need to run your build off of a fork, where >> you're >> >> free to cherry pick any change you fancy. >> >> >> >> It's actually a positive things to have your changes running in your >> >> production prior to being merged as it distributes the risk (as >> opposed to >> >> havd all new code getting productionized as Airbnb) >> >> >> >> Maxime >> >> >> >> On Tue, May 24, 2016 at 12:52 AM, Bolke de Bruin >> >> wrote: >> >> >> >> > Hi, >> >> > >> >> > I noticed that we started to slack a little in the commit messages. >> >> These >> >> > are the last commits excluding merges: >> >> > >> >> > aedb667 Make enhancements to VersionView >> >> > 0b3d101 [AIRFLOW-52] 1.7.1 version bump and changelog >> >> > 16740dd Add Kiwi.com as a user to README >> >> > 4b78e1a [AIRFLOW-143] setup_env.sh doesn't leverage cache for >> >> downloading >> >> > minicluster >> >> > 8ae8681 Increasing License Coverage >> >> > 7d32c17 Add a version view to display airflow version info >> >> > 4b25a7d [AIRFLOW-125] Add file to GCS operator >> >> > af43db5 [AIRFLOW-86] Wrap dict.items() in list for Py3 compatibilit= y >> >> > f01854a Adding Nerdwallet to the list of Currently officially using >> >> > Airflow: >> >> > 843a22f [AIRFLOW-127] Makes filter_by_owner aware of multi-owner DA= G >> >> > >> >> > Only one of those commits contains a description (4b25a7d). Only 4 >> out >> >> of >> >> > 10 start with an imperative and also only 4 out of 10 have a Jira >> >> attached >> >> > to them. I have no clue what =E2=80=9Cmake enhancements to versionv= iew=E2=80=9D will >> do >> >> or >> >> > "setup_env.sh doesn't leverage cache for downloading minicluster=E2= =80=9D. >> >> > >> >> > If we are to collaborate in a consensus model and trust each other = to >> >> have >> >> > good commits I think being able to use "git log=E2=80=9D and actual= ly >> understand >> >> > why (a what will be supplied by the diff) a change has been made is >> >> key. "A >> >> > project's long-term success rests (among other things) on its >> >> > maintainability and a maintainer has few tools more powerful than h= is >> >> > project's log.=E2=80=9D. If you are not aware what composes good co= mmits >> please >> >> > read http://chris.beams.io/posts/git-commit/ < >> >> > http://chris.beams.io/posts/git-commit/> , it is a really good >> article. >> >> > >> >> > Thanks! >> >> > Bolke >> >> > >> >> > >> >> > >> >> >> > >> > >> > --94eb2c123cc665860f0533c0ac9d--