From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 1/3] completion: merge options for cherry-pick and revert
Date: Tue, 27 Aug 2019 00:45:36 -0400 [thread overview]
Message-ID: <862802366ab2dc636614b737bbb5d4fe26dba9e4.1566880835.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1566880835.git.liu.denton@gmail.com>
Since revert and cherry-pick share the same sequencer code, they should
both accept the same command-line options. Derive the
`__git_cherry_pick_inprogress_options` and
`__git_revert_inprogress_options` variables from
`__git_sequencer_inprogress_options` so that the options aren't
unnecessarily duplicated twice.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
contrib/completion/git-completion.bash | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e087c4bf00..a7d3f58627 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1361,7 +1361,9 @@ _git_checkout ()
esac
}
-__git_cherry_pick_inprogress_options="--continue --quit --abort"
+__git_sequencer_inprogress_options="--continue --quit --abort"
+
+__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options
_git_cherry_pick ()
{
@@ -2512,7 +2514,7 @@ _git_restore ()
esac
}
-__git_revert_inprogress_options="--continue --quit --abort"
+__git_revert_inprogress_options=$__git_sequencer_inprogress_options
_git_revert ()
{
--
2.23.0.248.g3a9dd8fb08
next prev parent reply other threads:[~2019-08-27 4:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-24 9:04 [PATCH 0/2] completion: complete --skip for cherry-pick and revert Denton Liu
2019-08-24 9:04 ` [PATCH 1/2] completion: merge options " Denton Liu
2019-08-26 16:59 ` Junio C Hamano
2019-08-24 9:04 ` [PATCH 2/2] completion: add --skip " Denton Liu
2019-08-27 4:45 ` [PATCH v2 0/3] advertise --skip for cherry-pick and revert better Denton Liu
2019-08-27 4:45 ` Denton Liu [this message]
2019-08-27 4:45 ` [PATCH v2 2/3] completion: add --skip for cherry-pick and revert Denton Liu
2019-08-27 4:45 ` [PATCH v2 3/3] status: mention --skip for revert and cherry-pick Denton Liu
2019-08-27 21:56 ` Junio C Hamano
2019-08-27 23:18 ` Denton Liu
2019-08-28 2:47 ` Junio C Hamano
2019-08-28 6:45 ` Denton Liu
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=862802366ab2dc636614b737bbb5d4fe26dba9e4.1566880835.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
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 NNTP newsgroup(s).