summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-08-27 04:45:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-08-27 21:47:08 (GMT)
commitdeaa65a7545f2970167e32db3ff5f91b392f0517 (patch)
tree7c4f7668b87d88b95f99508b7c17a27df65e63be /contrib
parent745f6812895b31c02b29bdfe4ae8e5498f776c26 (diff)
downloadgit-deaa65a7545f2970167e32db3ff5f91b392f0517.zip
git-deaa65a7545f2970167e32db3ff5f91b392f0517.tar.gz
git-deaa65a7545f2970167e32db3ff5f91b392f0517.tar.bz2
completion: merge options for cherry-pick and revert
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash6
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e087c4b..a7d3f58 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 ()
{