Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:86332 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 31456 invoked from network); 21 May 2015 07:26:11 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 21 May 2015 07:26:11 -0000 Authentication-Results: pb1.pair.com smtp.mail=lior.k@zend.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=lior.k@zend.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain zend.com designates 209.85.218.41 as permitted sender) X-PHP-List-Original-Sender: lior.k@zend.com X-Host-Fingerprint: 209.85.218.41 mail-oi0-f41.google.com Received: from [209.85.218.41] ([209.85.218.41:33105] helo=mail-oi0-f41.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id D5/31-20801-1988D555 for ; Thu, 21 May 2015 03:26:10 -0400 Received: by oiww2 with SMTP id w2so4749124oiw.0 for ; Thu, 21 May 2015 00:26:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=5R0xSbQ7b3N+RAGhzz6ZkYNughnpEFlM/+KEcJTWaPk=; b=MZJqpaMN9hymfMbdq56bQDUsac15dIZXPLT6kAWwErUoF+RgLfg+GNJ7P2gNz6p0PP boAWG9teDvVeDzKRe/Hux2M6tjBoLrioyoBvxuD/trtPYEVj1IZe2x9L/yjhWuvNLwTJ N4OCmPoWGcfpyutTBVsubB80j7PO+HpwMN/g8Vw39cnMda0hZqFhDW9DmrujOZ7ckO7b XZ9S4OcNBzFsMqQOwiZq0LdAsjpHppzbc17y+eld4chGCKk2e5mPD5OaUo/a+Xfn4Mra GxNf2o6bHGmMmeN389YOKqtV0E2/xElAcZPO44cdS1i4tCa7b27e3/mtKDS2QzQUVIHz /E1Q== X-Gm-Message-State: ALoCoQkKLHfqm1ZafPA36rcpDUdnQfSgny78DsLIFKUcOxcGILnT8bbfw4TqtDjDA2MBK2U1cJGR/FWlWot8QXGMV6BACGQYFqBnepsw5zh7EOtukS9OL2Kd315QErRUvLKVbjx0ETbSgcsOiBM7PGgKq/DUkxHu24IJ3MMeVzZSZFhnsMfaaIw= MIME-Version: 1.0 X-Received: by 10.202.68.213 with SMTP id r204mr1057344oia.97.1432193166891; Thu, 21 May 2015 00:26:06 -0700 (PDT) Received: by 10.60.173.74 with HTTP; Thu, 21 May 2015 00:26:06 -0700 (PDT) In-Reply-To: <555D864F.10808@fedoraproject.org> References: <555D864F.10808@fedoraproject.org> Date: Thu, 21 May 2015 10:26:06 +0300 Message-ID: To: Remi Collet Cc: PHP internals list Content-Type: multipart/alternative; boundary=001a113d74eaf69adb051692748f Subject: Re: [PHP-DEV] About merging Pull Request workflow From: lior.k@zend.com (Lior Kaplan) --001a113d74eaf69adb051692748f Content-Type: text/plain; charset=UTF-8 Yep, is a real problem. We should keep the credit / commit info. I think we should remove "--no-ff" so it would just add the relevant commits instead of actually merging them without history (or even rebase the pull request to recent branch before merging). Kaplan On Thu, May 21, 2015 at 10:16 AM, Remi Collet wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hi, > > > Current workflow described in > https://wiki.php.net/vcs/gitworkflow#merge_a_pull_request > > Problem, git history only give info about a "merge" > > Ex, after merging 1278: > > > http://git.php.net/?p=php-src.git;a=commit;h=eef762d576e7744d6e0c8d6a3f997fe911b2dc34 > > Another simple workflow could be > > 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 > > This preserve credits to the authors and give a better history. > > What do you think ? > > > Remi > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2 > Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ > > iEYEARECAAYFAlVdhk8ACgkQYUppBSnxahhKuACfbXzDxPsZJTyfwLtyoTALPVhs > dbUAn2kk9vlD//ZQvea5Me1KU2JMgjdQ > =1Xi5 > -----END PGP SIGNATURE----- > > -- > PHP Internals - PHP Runtime Development Mailing List > To unsubscribe, visit: http://www.php.net/unsub.php > > --001a113d74eaf69adb051692748f--