Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:86333
Return-Path: <smalyshev@gmail.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 32954 invoked from network); 21 May 2015 07:28:15 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 21 May 2015 07:28:15 -0000
Authentication-Results: pb1.pair.com header.from=smalyshev@gmail.com; sender-id=pass
Authentication-Results: pb1.pair.com smtp.mail=smalyshev@gmail.com; spf=pass; sender-id=pass
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.220.46 as permitted sender)
X-PHP-List-Original-Sender: smalyshev@gmail.com
X-Host-Fingerprint: 209.85.220.46 mail-pa0-f46.google.com  
Received: from [209.85.220.46] ([209.85.220.46:33764] helo=mail-pa0-f46.google.com)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id FC/81-20801-E098D555 for <internals@lists.php.net>; Thu, 21 May 2015 03:28:15 -0400
Received: by padbw4 with SMTP id bw4so96288056pad.0
        for <internals@lists.php.net>; Thu, 21 May 2015 00:28:11 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=message-id:date:from:user-agent:mime-version:to:subject:references
         :in-reply-to:content-type:content-transfer-encoding;
        bh=2M+ynzYPmBmK3FPXxJwEWZhEpsFQj5QdEspHMdfX01E=;
        b=L7ZMuvav7s5RM2+aMva6nATLfN2pksJXym7kvn98QDT4vaEHb+/RJi5F4HKoCGhtMf
         FsBJh+AarBgJSosWvZAHQNGS05mvXQfgMtIfwIT3eIyGhejHgBblnc2QaX7vXFHRPkSa
         ni9qUXzmWX1RA03ZvRFG/m0jRnVUBJQ6ynO0HLQRcQ6gvL6WrovezorlHhK6CxFomzcf
         P1TiUMUQyOFNoeX0rdimGLGeZrO+T9bL5JFyzud2mr8vXqyXwMVMq9ZCTl49P2gUTaHP
         +K8K32z0oVncCA6jzXfsPSY+kBFewa40Eaub6gko+qgEOsFjuKdb+vjeooZ2onf5op6o
         lN8w==
X-Received: by 10.70.131.132 with SMTP id om4mr3028394pdb.30.1432193291899;
        Thu, 21 May 2015 00:28:11 -0700 (PDT)
Received: from Stas-Air.local (108-66-6-48.lightspeed.sntcca.sbcglobal.net. [108.66.6.48])
        by mx.google.com with ESMTPSA id ym6sm18332357pac.32.2015.05.21.00.28.10
        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Thu, 21 May 2015 00:28:11 -0700 (PDT)
Message-ID: <555D88FA.70009@gmail.com>
Date: Thu, 21 May 2015 00:27:54 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:31.0) Gecko/20100101 Thunderbird/31.7.0
MIME-Version: 1.0
To: Remi Collet <remi@fedoraproject.org>, internals@lists.php.net
References: <555D864F.10808@fedoraproject.org>
In-Reply-To: <555D864F.10808@fedoraproject.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Subject: Re: [PHP-DEV] About merging Pull Request workflow
From: smalyshev@gmail.com (Stanislav Malyshev)

Hi!

> Current workflow described in
> https://wiki.php.net/vcs/gitworkflow#merge_a_pull_request
> 
> Problem, git history only give info about a "merge"

If you merge from a pull, the history should contain both original
commit and the merge commit. So you know both who created the patch and
who merged it. At least for me it always did. Unless you use some
special tricks to edit the history, such as --no-commit.

> 1/ Download the patch
> https://github.com/php/php-src/pull/1278.patch
> 
> 2/ apply it
> git am 1278.patch
> 
> 3/ close the PR from
> https://qa.php.net/pulls

You can do this but it's more work and tries to work around github
instead of using facilities it provides. I'm not sure there's a reason
for that.

-- 
Stas Malyshev
smalyshev@gmail.com