From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sverre Rabbelier Subject: Re: [RFH] rebase -i optimization Date: Thu, 26 Feb 2009 16:33:32 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , Stephen Haberman , "Shawn O. Pearce" , Thomas Rast , Git Mailing List , Stephan Beyer , Christian Couder , Daniel Barkalow To: Johannes Schindelin X-From: git-owner@vger.kernel.org Thu Feb 26 16:35:13 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 1LciGP-00068d-AO for gcvg-git-2@gmane.org; Thu, 26 Feb 2009 16:35:05 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754986AbZBZPdi convert rfc822-to-quoted-printable (ORCPT ); Thu, 26 Feb 2009 10:33:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754969AbZBZPdh (ORCPT ); Thu, 26 Feb 2009 10:33:37 -0500 Received: from mu-out-0910.google.com ([209.85.134.184]:50309 "EHLO mu-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754336AbZBZPdg convert rfc822-to-8bit (ORCPT ); Thu, 26 Feb 2009 10:33:36 -0500 Received: by mu-out-0910.google.com with SMTP id i10so228859mue.1 for ; Thu, 26 Feb 2009 07:33:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=zlGse/KZEDocLyjCI0VYyyq6omsqA3ozW2WYSFbu93s=; b=WF+kjXzYGagTp6HWD8i/4bHG+Qa0OICEsI+xRy2TvOLrDGAT8D6hHtb24FpVd+2e33 qqCodNLD5EtO76d8ssgBZMqFseYArJgSAX1s9jwYEcv+6E2SKACQI0rzoaYrSi88IJ0f U7oAFBu8qrIqFYilFz05ZuaB6vpam/TPW2mDc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=iGj94FkVTdGYOZcSCjeeBm3ih/TNwlQe+bGJmhhFTuXFdGSgl0dbej1EOgP28InY/j KDvc38em+AdhGLKVUibzBlmda12NNxaFlEVRuJJ/2UEHNoVtDWN1I8OIVFb3fCjsK/mp KkE909kvymAGYkgAMNXvide9YoJBSD6oSW/X0= Received: by 10.103.161.16 with SMTP id n16mr725404muo.79.1235662412579; Thu, 26 Feb 2009 07:33:32 -0800 (PST) In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Heya, On Thu, Feb 26, 2009 at 15:59, Johannes Schindelin wrote: > This code is supposed to do exactly what you want: Hmmm, I can't say I understand it 100%, but what I can see from reading the code and looking at the output of 'rebase -i -v' is that it does a 'git reset --hard' on each commit if it was already applied, instead of figuring out beforehand what to reset to? If that is the case, it might still take a long time to do the rebase if it takes long to do the 'reset --hard' between the patches (say, if a big change is made). > Unfortunately, it seems to be quite broken by all the different direc= tions > rebase -i was pulled to, but maybe you see the bug right away. =A0Oth= erwise, > I'll try to reschedule my Git time budget later tonight. After reading the code and trying with -v, I don't think the current code is broken, just that it might be optimized to be even faster? --=20 Cheers, Sverre Rabbelier