From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karl =?iso-8859-1?Q?Hasselstr=F6m?= Subject: Re: [RFC][StGit PATCH] Add support for merge-friendly branches Date: Fri, 29 May 2009 09:20:50 +0200 Message-ID: <20090529072050.GA9760@diana.vm.bytemark.co.uk> References: <20090528111212.21925.45527.stgit@pc1117.cambridge.arm.com> <20090528124817.GA22262@diana.vm.bytemark.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org To: Catalin Marinas X-From: git-owner@vger.kernel.org Fri May 29 09:21:02 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1M9wOj-0003f2-FS for gcvg-git-2@gmane.org; Fri, 29 May 2009 09:21:01 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754870AbZE2HUu convert rfc822-to-quoted-printable (ORCPT ); Fri, 29 May 2009 03:20:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753848AbZE2HUu (ORCPT ); Fri, 29 May 2009 03:20:50 -0400 Received: from diana.vm.bytemark.co.uk ([80.68.90.142]:52730 "EHLO diana.vm.bytemark.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752021AbZE2HUu (ORCPT ); Fri, 29 May 2009 03:20:50 -0400 Received: from kha by diana.vm.bytemark.co.uk with local (Exim 3.36 #1 (Debian)) id 1M9wOY-0002es-00; Fri, 29 May 2009 08:20:50 +0100 Content-Disposition: inline In-Reply-To: X-Manual-Spam-Check: kha@treskal.com, clean User-Agent: Mutt/1.5.9i Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On 2009-05-28 15:51:20 +0100, Catalin Marinas wrote: > 2009/5/28 Catalin Marinas : > > > 2009/5/28 Karl Hasselstr=F6m : > > > > > This funcion should probably return a list of zero or more merge > > > bases. See the --all flag to git merge-base. > > > > OK, I'll add this and check the stack base against this set(list). > > What about this change to the original patch (it's faster to just > return the sha1 refs than building the Commit objects): Creating Commit objects is really cheap---just look at the constructor. I made them that way on purpose, so that we'd never have to think twice about using Commit objects instead of passing sha1s around. Also, you said "set", and I agree---the return value of get_mege_bases() should be a set. That's what it _is_, conceptually, and it makes little sense to obscure that fact. --=20 Karl Hasselstr=F6m, kha@treskal.com www.treskal.com/kalle