From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Shawn O. Pearce" Subject: [PATCH 1/2] bash: Support git-rebase -m continuation completion. Date: Mon, 5 Feb 2007 21:37:54 -0500 Message-ID: <20070206023754.GA9922@spearce.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Feb 06 03:38:08 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HEGDg-0007Qz-Dk for gcvg-git@gmane.org; Tue, 06 Feb 2007 03:38:08 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965460AbXBFCh6 (ORCPT ); Mon, 5 Feb 2007 21:37:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965457AbXBFCh6 (ORCPT ); Mon, 5 Feb 2007 21:37:58 -0500 Received: from corvette.plexpod.net ([64.38.20.226]:46948 "EHLO corvette.plexpod.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965460AbXBFCh6 (ORCPT ); Mon, 5 Feb 2007 21:37:58 -0500 Received: from cpe-74-70-48-173.nycap.res.rr.com ([74.70.48.173] helo=asimov.home.spearce.org) by corvette.plexpod.net with esmtpa (Exim 4.63) (envelope-from ) id 1HEGDJ-00014G-2F; Mon, 05 Feb 2007 21:37:45 -0500 Received: by asimov.home.spearce.org (Postfix, from userid 1000) id EF79620FBAE; Mon, 5 Feb 2007 21:37:54 -0500 (EST) Content-Disposition: inline User-Agent: Mutt/1.5.11 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - corvette.plexpod.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [0 0] / [47 12] X-AntiAbuse: Sender Address Domain - spearce.org X-Source: X-Source-Args: X-Source-Dir: Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Apparently `git-rebase -m` uses a metadata directory within .git (.git/.dotest-merge) rather than .dotest used by git-am (and git-rebase without the -m option). This caused the completion code to not offer --continue, --skip or --abort when working within a `git-rebase -m` session. Signed-off-by: Shawn O. Pearce --- This is a resend. You skipped this series of 2 patches. contrib/completion/git-completion.bash | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 430e636..b0ff87d 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -675,7 +675,7 @@ _git_push () _git_rebase () { local cur="${COMP_WORDS[COMP_CWORD]}" - if [ -d .dotest ]; then + if [ -d .dotest ] || [ -d .git/.dotest-merge ]; then __gitcomp "--continue --skip --abort" return fi -- 1.5.0.rc3.58.g79812