From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?Q?David_K=C3=A5gedal?= Subject: Re: StGIT loses Git commit using "stg repair"; I miss "stg assimilate" Date: Tue, 08 Jan 2008 00:15:13 +0100 Message-ID: <87y7b1xm66.fsf@lysator.liu.se> References: <200801072345.21585.jnareb@gmail.com> <873at9z0w2.fsf@lysator.liu.se> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Jan 08 00:15:37 2008 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 1JC1Bw-0000NG-BH for gcvg-git-2@gmane.org; Tue, 08 Jan 2008 00:15:36 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755560AbYAGXPI convert rfc822-to-quoted-printable (ORCPT ); Mon, 7 Jan 2008 18:15:08 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755418AbYAGXPH (ORCPT ); Mon, 7 Jan 2008 18:15:07 -0500 Received: from main.gmane.org ([80.91.229.2]:58478 "EHLO ciao.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753928AbYAGXPG (ORCPT ); Mon, 7 Jan 2008 18:15:06 -0500 Received: from root by ciao.gmane.org with local (Exim 4.43) id 1JC1BO-0000Ak-6H for git@vger.kernel.org; Mon, 07 Jan 2008 23:15:02 +0000 Received: from 87.96.142.114 ([87.96.142.114]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 07 Jan 2008 23:15:02 +0000 Received: from davidk by 87.96.142.114 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 07 Jan 2008 23:15:02 +0000 X-Injected-Via-Gmane: http://gmane.org/ X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 87.96.142.114 User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) Cancel-Lock: sha1:WEnHHkWbwAPLt7LaNM50RKVGbfU= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: David K=C3=A5gedal writes: > Jakub Narebski writes: > >> I have StGIT branch with no patches applied: all patches are on stac= k. >> I have accidentally added git commit on top of StGIT branch head. >> I tried to use "stg assimilate" to turn this commit into StGIT commi= t,=20 >> applied, but new version of StGIT has only "stg repair". And the=20 >> sequence > > If you have no patches, there is nothing to assimilate or repair. You= r That should have been "if you have no patches *applied* ..." > patch stack is considered to be on top of your new commit, so if you > push a patch it will appear on top of the commit you just created. > > To turn your new commit into a patch, use "stg uncommit". > >> # stg repair >> # stg rebase origin >> >> made me lose this git commit (well, up to reflog of course). This sh= ould=20 >> not happen! Why assimilate got removed? > > repair does exactly what assimilate did in this case, so it would not > have helped you. --=20 David K=C3=A5gedal