Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:66639 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 71720 invoked from network); 15 Mar 2013 09:53:57 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 15 Mar 2013 09:53:57 -0000 Authentication-Results: pb1.pair.com smtp.mail=damz@damz.org; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=damz@damz.org; sender-id=pass Received-SPF: pass (pb1.pair.com: domain damz.org designates 209.85.223.170 as permitted sender) X-PHP-List-Original-Sender: damz@damz.org X-Host-Fingerprint: 209.85.223.170 mail-ie0-f170.google.com Received: from [209.85.223.170] ([209.85.223.170:37440] helo=mail-ie0-f170.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 6B/42-59234-4BFE2415 for ; Fri, 15 Mar 2013 04:53:57 -0500 Received: by mail-ie0-f170.google.com with SMTP id c11so4213600ieb.29 for ; Fri, 15 Mar 2013 02:53:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=damz.org; s=google; h=mime-version:x-received:x-originating-ip:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=p8j0L1gIY3JcLbFm5MhKX14M1HZzcM3jXvjmW2vSWyg=; b=rcqn+3rMa2fRUol904v0Uu2CCAbjdFvHFCblq7RGoWqLVa/qF4/4+DyOzXLKtwuU6y Cv2sqcUfSewNhOLnwCJ4Vx6WAhUbEkIPNOo/SZMqhThOtWLuctH222dNihWh0WGpFL91 99ZDq0Yom3khh+WPVwnAWeutERcOYh2lZJ0x4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-received:x-originating-ip:in-reply-to:references :date:message-id:subject:from:to:cc:content-type:x-gm-message-state; bh=p8j0L1gIY3JcLbFm5MhKX14M1HZzcM3jXvjmW2vSWyg=; b=RQxFnm5RbaRzT1txBvP5kEnYTYvLz30l5lMR4Wg6igo/ozCLn0r08EL/9kRoyodZ+a ehoU2jTfYnDahTFdRnriJAmtIQ3P8K7m7RKzvLW5ScQpEZFwp306KeO+7AkCoINLgG0P RaYDD1J1/vbDg7ne9z2ozbYSfCuX7qk1Pv6v6Ml9K2IyYatFGaWlcBVGW2TAeg1ZpA2I 3WAcsmrRGh/baTHsqL/C0JPKwwdl/LyVuuMU67ydMuUo/VO98QseawsV6aaAJVXVqBaS UnmyhbylHso+FJUXbpbDraPEiYlilzMsO8pD25LRQQ0YKEuGPaD5Zgw5laJrpbl0Hs0R 1Xcw== MIME-Version: 1.0 X-Received: by 10.50.17.71 with SMTP id m7mr731007igd.14.1363341233907; Fri, 15 Mar 2013 02:53:53 -0700 (PDT) Received: by 10.50.132.34 with HTTP; Fri, 15 Mar 2013 02:53:53 -0700 (PDT) X-Originating-IP: [92.103.57.251] In-Reply-To: References: Date: Fri, 15 Mar 2013 10:53:53 +0100 Message-ID: To: Dmitry Stogov Cc: Patrick ALLAERT , Xinchen Hui , David Soria Parra , Rasmus Lerdorf , Zeev Suraski , PHP Internals Content-Type: text/plain; charset=ISO-8859-1 X-Gm-Message-State: ALoCoQnOsUxH3HsW69ipNFjKalKLeipSqikmxZyisAbWKmxt0kJgRykeZSXWejP3FJhtror6ZYAC Subject: Re: [PHP-DEV] Re: Merging O+ into 5.5 From: damz@damz.org (Damien Tournoud) On Fri, Mar 15, 2013 at 10:24 AM, Dmitry Stogov wrote: > I mean not "git subtree merge" but "git read-dir --prefix ...". > Actually it imports all the history form O+ repo, but it's recorded with > original patches (e.g. ZendAccelerator.h instead of moved > ext/ZendOptimizerPlus/ZendAccelerator.h), so you can see it running "git > log", but not "git log ext/ZendOptimizerPlus/ZendAccelerator.h". Here you are: $ git clone git://github.com/zend-dev/ZendOptimizerPlus.git $ git clone git://github.com/php/php-src.git $ cd php-src $ git remote add opcode ../ZendOptimizerPlus $ git checkout -b opcode opcode/master $ git filter-branch -f --index-filter 'git read-tree --empty ; git read-tree --prefix=ext/opcode "$GIT_COMMIT"' HEAD $ git checkout -b master origin/master $ git merge opcode Damien