From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: cherry-pick is slow Date: Mon, 14 May 2012 10:54:12 -0400 Message-ID: <20120514145412.GA1159@sigill.intra.peff.net> References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Junio C Hamano , git@vger.kernel.org To: Dmitry Risenberg X-From: git-owner@vger.kernel.org Mon May 14 16:54:39 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1STwfU-0004KR-45 for gcvg-git-2@plane.gmane.org; Mon, 14 May 2012 16:54:36 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755663Ab2ENOyT (ORCPT ); Mon, 14 May 2012 10:54:19 -0400 Received: from 99-108-226-0.lightspeed.iplsin.sbcglobal.net ([99.108.226.0]:42745 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752402Ab2ENOyS (ORCPT ); Mon, 14 May 2012 10:54:18 -0400 Received: (qmail 20311 invoked by uid 107); 14 May 2012 14:54:39 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Mon, 14 May 2012 10:54:39 -0400 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Mon, 14 May 2012 10:54:12 -0400 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Sun, May 13, 2012 at 07:39:49PM +0400, Dmitry Risenberg wrote: > However, cherry-picking is still not as fast as I expected it to be - > cherry-picking a single-file commit takes about 14-15 seconds, fully > using one CPU core. Anything else I can improve? It's probably detecting renames as part of the merge, which can be expensive if the thing you are cherry-picking is far away from HEAD. You can try setting the merge.renamelimit config variable to something small (like 1; setting it to 0 means "no limit"). -Peff