Return-Path: <dev-return-36114-archive-asf-public=cust-asf.ponee.io@hc.apache.org>
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 D7932200C7F
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 24 May 2017 19:12:24 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id D64CF160BB6; Wed, 24 May 2017 17:12:24 +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 251E9160BA5
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 24 May 2017 19:12:23 +0200 (CEST)
Received: (qmail 5220 invoked by uid 500); 24 May 2017 17:12:23 -0000
Mailing-List: contact dev-help@hc.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@hc.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@hc.apache.org>
List-Post: <mailto:dev@hc.apache.org>
List-Id: <dev.hc.apache.org>
Reply-To: "HttpComponents Project" <dev@hc.apache.org>
Delivered-To: mailing list dev@hc.apache.org
Received: (qmail 5190 invoked by uid 99); 24 May 2017 17:12:23 -0000
Received: from mail-relay.apache.org (HELO mail-relay.apache.org) (140.211.11.15)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 May 2017 17:12:23 +0000
Received: from [192.168.1.6] (p4FF7766B.dip0.t-ipconnect.de [79.247.118.107])
	by mail-relay.apache.org (ASF Mail Server at mail-relay.apache.org) with ESMTPSA id AABCF1A0ABD
	for <dev@hc.apache.org>; Wed, 24 May 2017 17:12:22 +0000 (UTC)
Subject: Re: [VOTE] Git Guidelines (2)
Reply-To: HttpComponents Project <dev@hc.apache.org>
References: <ab689855-07c1-7e99-c224-a3f63cce9240@apache.org>
To: HttpComponents Project <dev@hc.apache.org>
From: Michael Osipov <michaelo@apache.org>
Message-ID: <d9424fcc-d171-7e2a-f259-4a9429755195@apache.org>
Date: Wed, 24 May 2017 19:12:18 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.8.0
MIME-Version: 1.0
In-Reply-To: <ab689855-07c1-7e99-c224-a3f63cce9240@apache.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
archived-at: Wed, 24 May 2017 17:12:25 -0000

Am 2017-05-24 um 19:11 schrieb Michael Osipov:
> Hi folks,
>
> I am re-casting this vote for the previously discussed Git guidelines
> for all committers to make life easier for everyone. If the vote passes,
> every committer must abide to this.
>
> The guidelines:
> = Typical Issue Workflow =
>
>  1. Branch off a release branch (e.g., 4.4.x, 5.0.x) ({{{git checkout -b
> <release branch>/<JIRA id> master}}}) where {{{<JIRA id>}}} being the
> JIRA issue you have assigned to yourself, e.g., HTTPCORE-123 or
> HTTPCLIENT-689. Exmaple: {{{git checkout -b 4.4.x/HTTPCORE-123 4.4.x}}}.
>  1. Work on your issue and create as many commits as you want/need
>  1. Polish it, squash it or fix it up into a single commit
>  1. Ask for a review if you are uncertain
>  1. Take care of a proper commit message (good reads:
> [[https://chris.beams.io/posts/git-commit/|1]] and
> [[https://github.com/erlang/otp/wiki/Writing-good-commit-messages|2]]):
> Put the title of the JIRA issue, e.g., [HTTPCORE-123] Memory leak in
> response, in the first line, followed by an explanation why you did take
> this approach. The ticket desc contains the issue, your commit message
> contains the solution. If in doubt, ask for help and give people a
> couple of days to react.
>  1. Request the release manager to merge your banch back to the release
> branch and make sure that this merge won't incur a merge commit
>  1. When you close the issue, put a link to your commit to create a
> direct relation between issue and solution.
>
> =  Side Notes =
>
>  1. Never rewrite (rebase) history on master or any other long-lived
> branch because you will break others. Only the release manager is
> entitled to clean up history upto 72 hours after a commit if it is
> absolutely necessary
>  1. If a change comes for a PR on GitHub:
>    * Apply the same above rules
>    * Don't steal authorship
>    * Let the reporter polish his work
>    * Amend the message at the end with "This closes/fixes #xy" and push.
>
>
> Link: https://wiki.apache.org/HttpComponents/GitGuidelines
>
> Vote is open until 2017-05-29 00:00 Etc/UTC.
>
> [ ] +1 Committers must abide to these Git guidelines while working on
> the code
> [ ] -1 I do not agree with this guideline

+1 from me for a clean workflow and history...


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
For additional commands, e-mail: dev-help@hc.apache.org