Return-Path: X-Original-To: apmail-falcon-dev-archive@minotaur.apache.org Delivered-To: apmail-falcon-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 586AA105A2 for ; Fri, 9 Jan 2015 17:47:38 +0000 (UTC) Received: (qmail 77085 invoked by uid 500); 9 Jan 2015 17:47:39 -0000 Delivered-To: apmail-falcon-dev-archive@falcon.apache.org Received: (qmail 77043 invoked by uid 500); 9 Jan 2015 17:47:39 -0000 Mailing-List: contact dev-help@falcon.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.apache.org Delivered-To: mailing list dev@falcon.apache.org Received: (qmail 77030 invoked by uid 99); 9 Jan 2015 17:47:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jan 2015 17:47:39 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of vseetharam@gmail.com designates 209.85.216.42 as permitted sender) Received: from [209.85.216.42] (HELO mail-qa0-f42.google.com) (209.85.216.42) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jan 2015 17:47:33 +0000 Received: by mail-qa0-f42.google.com with SMTP id n8so7996497qaq.1 for ; Fri, 09 Jan 2015 09:45:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:content-type; bh=59GtIEs0a6Yt00lnRzU4GBpveKa/E5TwGt5wf5Kt48c=; b=oKIeo52g9FacuN5//lQ5hOAN54yp50fEOGik42ru1fmuPiz8Fk0CFeKcw1JRLRwhQW mCAEWajBFlWshgHAp0tK2m+IQhNRWFBJAVOaGbUaa7klfMTrhZlDQUKiAIHyI8ubC4Fm /H6qc95C2DcKBVuqzwQB9FwDM6MARrt4LaQ9X+6zWV+ovgfmm6G9pznSRYRqHMG7Sj8N GSHsxV+TNqm/+CwuORknHj5mtUfaC1/YgMy+dVfzS6Cdd9brhYqKat37jxK1C3MWWDqI /j/YRAMYNzEWHGeaWuMmBB7z6UKduC7BHTOm7jLwTv6DBMz5dRIk7dRS+WEMDMl0Eed2 o4Vg== MIME-Version: 1.0 X-Received: by 10.224.41.10 with SMTP id m10mr28101139qae.47.1420825543130; Fri, 09 Jan 2015 09:45:43 -0800 (PST) Sender: vseetharam@gmail.com Received: by 10.140.33.247 with HTTP; Fri, 9 Jan 2015 09:45:43 -0800 (PST) In-Reply-To: References: Date: Fri, 9 Jan 2015 09:45:43 -0800 X-Google-Sender-Auth: b0_gfJRjJUjETcMXNHeg5pbT3sw Message-ID: Subject: Re: [DISCUSS] Alternative flow for committing patches From: Seetharam Venkatesh To: dev@falcon.apache.org Content-Type: multipart/alternative; boundary=047d7b6760dec9455a050c3bb9f2 X-Virus-Checked: Checked by ClamAV on apache.org --047d7b6760dec9455a050c3bb9f2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Due credit is given to all contributors in the current approach and we make sure contributor names are added in the commit message. I do not see what is the issue? On Fri, Jan 9, 2015 at 3:28 AM, Ajay Yadav wrote: > Hi, > > Currently when we commit a patch, the git commit shows the commit in the > name of the person who committed the patch to the trunk(committer) and by > convention the committer mentions the name of the person who contributed > the patch(contributor) in the commit message. Committers also need to mak= e > changes to CHANGES.txt to log the change for release notes etc. Git has a > provision to distinguish between author(contributor) and the committer. I > would like to propose another approach and hear your thoughts on this. > > Commit a patch using the following command > git am falcon-652-v2.patch > > If you have reviewed the patch as well then use -s option and git will > append Signed-off-by: with your git handle in the extended commit message= . > > This command uses the commit metadata in the patch to create a commit. It > also adds a metadata of "signed off by" using the handle of the committer > who is applying the patch. This way the commit is in the name of the > contributor and sign off is in the name of the committer who committed th= e > patch. > > Please note > > - Contributors will need to *squash* all commits into one before > submitting the patch. If a patch consists of two commits, the command > will > create two commits in the trunk. *This behaviour is same as in a githu= b > pull request.* > - Contributors will need to generate their patches using *git > format-patch* command and not using the git diff command. > - Contributors will also need to make the changes to CHANGES.txt > > *Pros:* > > - Biggest pro of this approach is that author of commit is the person > who contributed this patch (this should compensate for the extra steps > that > the contributors need to make). > - Commit messages will be more detailed and more relevant. Users can n= ow > add extended commit messages explaining the changes in more details an= d > they will not be lost. > - Will make committing a patch easier for a committer (less in numbers > than contributors). Committers can use this approach to commit multipl= e > patches in one go. > > > > Cheers > Ajay Yadava > --=20 Regards, Venkatesh =E2=80=9CPerfection (in design) is achieved not when there is nothing more = to add, but rather when there is nothing more to take away.=E2=80=9D - Antoine de Saint-Exup=C3=A9ry --047d7b6760dec9455a050c3bb9f2--