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>
Denton Liu committed
Aug 27, 2019 at 00:45 UTC
deaa65a7545f2970167e32db3ff5f91b392f0517
1 file changed
+4
-2
contrib/completion/git-completion.bash
+4
-2
@@ -1361,7 +1361,9 @@ _git_checkout ()
1361
esac
1362
}
1363
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
1367
1368
_git_cherry_pick ()
1369
{
@@ -2512,7 +2514,7 @@ _git_restore ()
2514
esac
2515
}
2516
2515
-__git_revert_inprogress_options="--continue --quit --abort"
2517
+__git_revert_inprogress_options=$__git_sequencer_inprogress_options
2518
2519
_git_revert ()
2520
{