From: Thomas Braun <thomas.braun@virtuell-zuhause.de>
To: John Keeping <john@keeping.me.uk>
Cc: git <git@vger.kernel.org>, "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder@ira.uka.de>,
"Ramkumar Ramachandra" <artagnon@gmail.com>
Subject: [PATCH v2] completion: Add '--edit-todo' to rebase
Date: Mon, 27 Jul 2015 19:54:09 +0200 (CEST) [thread overview]
Message-ID: <1064256694.3063.1438019649384.JavaMail.open-xchange@app07.ox.hosteurope.de> (raw)
In-Reply-To: <20150713131107.GC1451@serenity.lan>
Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
---
> John Keeping <john@keeping.me.uk> hat am 13. Juli 2015 um 15:11 geschrieben:
> git-rebase.sh contains:
>
> if test "$action" = "edit-todo" && test "$type" != "interactive"
> then
> die "$(gettext "The --edit-todo action can only be used during interactive
> rebase.")"
> fi
>
> I wonder if it's worth doing a similar check here, which presumably
> means testing if "$dir"/interactive exists.
Good point. Thanks for the hint.
contrib/completion/git-completion.bash | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index c97c648..b03050e 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1668,7 +1668,11 @@ _git_rebase ()
{
local dir="$(__gitdir)"
if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
- __gitcomp "--continue --skip --abort"
+ if [ -d "$dir"/interactive ]; then
+ __gitcomp "--continue --skip --abort --edit-todo"
+ else
+ __gitcomp "--continue --skip --abort"
+ fi
return
fi
__git_complete_strategy && return
--
2.4.5.windows.1
next prev parent reply other threads:[~2015-07-27 17:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-13 11:27 [PATCH] completion: Add '--edit-todo' to rebase Thomas Braun
2015-07-13 13:11 ` John Keeping
2015-07-27 17:54 ` Thomas Braun [this message]
2015-07-30 11:24 ` [PATCH v2] " SZEDER Gábor
2015-07-30 11:29 ` John Keeping
2015-07-31 10:16 ` SZEDER Gábor
2015-07-31 17:37 ` Thomas Braun
2015-08-01 9:25 ` SZEDER Gábor
2015-08-05 13:40 ` [PATCH v3 1/1] completion: offer '--edit-todo' during interactive rebase Thomas Braun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1064256694.3063.1438019649384.JavaMail.open-xchange@app07.ox.hosteurope.de \
--to=thomas.braun@virtuell-zuhause.de \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=szeder@ira.uka.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).