undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

completion: merge options for cherry-pick and revert

Browse Source 
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>
This commit is contained in:
Denton Liu 2019-08-27 00:45:36 -04:00 committed by Junio C Hamano
parent 745f681289
commit deaa65a754
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/completion/git-completion.bash
View File

@ -1361,7 +1361,9 @@ _git_checkout ()
esac 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 () _git_cherry_pick ()
{ {
@ -2512,7 +2514,7 @@ _git_restore ()
esac esac
} }
__git_revert_inprogress_options="--continue --quit --abort" __git_revert_inprogress_options=$__git_sequencer_inprogress_options
_git_revert () _git_revert ()
{ {