Skip to content

Commit deaa65a

Browse files
Denton-Lgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 745f681 commit deaa65a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

contrib/completion/git-completion.bash

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,7 +1361,9 @@ _git_checkout ()
13611361
esac
13621362
}
13631363

1364-
__git_cherry_pick_inprogress_options="--continue --quit --abort"
1364+
__git_sequencer_inprogress_options="--continue --quit --abort"
1365+
1366+
__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options
13651367

13661368
_git_cherry_pick ()
13671369
{
@@ -2512,7 +2514,7 @@ _git_restore ()
25122514
esac
25132515
}
25142516

2515-
__git_revert_inprogress_options="--continue --quit --abort"
2517+
__git_revert_inprogress_options=$__git_sequencer_inprogress_options
25162518

25172519
_git_revert ()
25182520
{

0 commit comments

Comments
 (0)