From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Jakub Narebski Subject: Re: [PATCH] rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am Date: Fri, 08 Dec 2006 22:44:08 +0100 Organization: At home Message-ID: References: <20061208212830.GB13944@localdomain> <11656133963055-git-send-email-normalperson@yhbt.net> <1165613397460-git-send-email-normalperson@yhbt.net> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-2 Content-Transfer-Encoding: QUOTED-PRINTABLE NNTP-Posting-Date: Fri, 8 Dec 2006 21:42:14 +0000 (UTC) Return-path: Envelope-to: gcvg-git@gmane.org X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 27 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: host-81-190-25-107.torun.mm.pl Mail-Copies-To: jnareb@gmail.com User-Agent: KNode/0.10.2 Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by dough.gmane.org with esmtp (Exim 4.50) id 1GsnTu-0001GR-4O for gcvg-git@gmane.org; Fri, 08 Dec 2006 22:42:10 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947319AbWLHVmH convert rfc822-to-quoted-printable (ORCPT ); Fri, 8 Dec 2006 16:42:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1947325AbWLHVmH (ORCPT ); Fri, 8 Dec 2006 16:42:07 -0500 Received: from main.gmane.org ([80.91.229.2]:41814 "EHLO ciao.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947323AbWLHVmE (ORCPT ); Fri, 8 Dec 2006 16:42:04 -0500 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1GsnTk-00011T-Se for git@vger.kernel.org; Fri, 08 Dec 2006 22:42:00 +0100 Received: from host-81-190-25-107.torun.mm.pl ([81.190.25.107]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 08 Dec 2006 22:42:00 +0100 Received: from jnareb by host-81-190-25-107.torun.mm.pl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 08 Dec 2006 22:42:00 +0100 To: git@vger.kernel.org Sender: git-owner@vger.kernel.org Eric Wong wrote: Just one comment: > +=A0=A0=A0=A0=A0=A0=A0if test -d "$GIT_DIR/rr-cache" > +=A0=A0=A0=A0=A0=A0=A0then > +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0git-rerere clear > +=A0=A0=A0=A0=A0=A0=A0fi > =A0=A0=A0=A0=A0=A0=A0=A0this=3D`expr "$this" + 1` > =A0=A0=A0=A0=A0=A0=A0=A0resume=3D > =A0fi > @@ -408,6 +412,10 @@ do > =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0stop_here_user_resolve $this > =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0fi > =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0apply_status=3D0 > +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0if test -d "$GIT_DIR/rr= -cache" > +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0then > +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= git rerere > +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0fi Why do you use once "git-rerere", and another time "git rerere"? Shouldn't scripts always use git-command form? --=20 Jakub Narebski Warsaw, Poland ShadeHawk on #git