From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28838 invoked by alias); 29 Oct 2013 18:12:50 -0000 Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org Received: (qmail 28771 invoked by uid 89); 29 Oct 2013 18:12:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f42.google.com Received: from mail-pa0-f42.google.com (HELO mail-pa0-f42.google.com) (209.85.220.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 29 Oct 2013 18:12:48 +0000 Received: by mail-pa0-f42.google.com with SMTP id kp14so393093pab.1 for ; Tue, 29 Oct 2013 11:12:47 -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=N3b1qQOvxAym5c1J5nx6Do6Kz6ONtpPWa+K8yIfNTVQ=; b=iXMTem+gcGEVGEUQ/wW8v48pGH7/gWBawgkvyCqsI5M+NZOHoZbnPgXcPCOiOpBGS8 xdpkFTKYAUgwGsnrQeoFZb9f9HCRPhGkYINDs5TqScX92878eR7Im5cZEmgr2dOGj2jN 4A/kv5z/aj6h0l2MkpVulenyDB0a1Ew94ksT+VXABcumXPBuvdsgo1lN8/5jc2KwQC+O Q1J3PO+FxOvjDf7YDiQtxDqZ6+NSOnG5+xW82irpVlBUExOOr8KOHwfnkAfAG317GGwY EK5BFt3MHXnqC7zSNze2jZnByVPza9PThPgsL9dswvqNxgHrmFmWgvS2JxnsWW7JyGxK Dt/w== X-Gm-Message-State: ALoCoQn+69SxCCZm46t/V1TY+JEnR64IggfohCoY1UqBiqmHsu3PFjGB/nRi77y2+QPXZubqSWFwJru/Uuulc1Czj+coMb5IX7fzePXi5NT3tnBnsJbbWEJCiWJhXz5m6h5RNKGwQhux1t2GTm5hUqwwm6B9Imf2UBoP/OneGZjbqvzVlm92ZO/VzA5bIVEUAQSgbBeu6qTg MIME-Version: 1.0 X-Received: by 10.66.144.102 with SMTP id sl6mr1744590pab.96.1383070366899; Tue, 29 Oct 2013 11:12:46 -0700 (PDT) Received: by 10.68.194.230 with HTTP; Tue, 29 Oct 2013 11:12:46 -0700 (PDT) In-Reply-To: <87iowgalle.fsf@fleche.redhat.com> References: <877gd5iyaz.fsf@fleche.redhat.com> <5266CCDC.6090803@redhat.com> <87iowgalle.fsf@fleche.redhat.com> Date: Tue, 29 Oct 2013 18:12:00 -0000 Message-ID: Subject: Re: git is live From: Cary Coutant To: Tom Tromey Cc: Pedro Alves , GDB Development , Binutils Development Content-Type: text/plain; charset=ISO-8859-1 X-IsSubscribed: yes X-SW-Source: 2013-10/txt/msg00181.txt.bz2 > You want git rebase --onto. > > I did it using "git format-patch" followed by "git am" the first time. > The second time I did Pedro's approach and used "git rebase --onto". > Both of these worked great, though some manual labor is needed. > (Actually the second time I wrote a script to automate it: using git > merge-base to find the root of a branch and then looking up the > corresponding commit in the new tree -- but for reasons I don't know it > only worked for about half of my branches.) Yeah, I tried rebase --onto for one branch, and format-patch for another. Both worked fine, but the fetch-and-rebase approach imports a whole commit history dating back to the beginning of time into the new repo. It seems like it'll be easier to make sure I don't leak old commit history from the old repo into the new one with format-patch. I'm not sure how much I've bloated my repo just from fetching the one branch -- presumably it's not a lot, since the content store is based on hashes, but I might reclone and compare sizes just to see. (Maybe a git gc will clean things up, too.) -cary