Skip to content

Commit 1e6a1c5

Browse files
committed
fixup! builtin rebase: support --gpg-sign option
The `--gpg-sign` option takes an *optional* argument, not a mandatory one. This was discovered as part of the investigation of #1836. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent ddb6e5c commit 1e6a1c5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

builtin/rebase.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -1030,8 +1030,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
10301030
OPT_BOOL(0, "autosquash", &options.autosquash,
10311031
N_("move commits that begin with "
10321032
"squash!/fixup! under -i")),
1033-
OPT_STRING('S', "gpg-sign", &gpg_sign,
1034-
N_("gpg-sign?"), N_("GPG-sign commits")),
1033+
{ OPTION_STRING, 'S', "gpg-sign", &gpg_sign, N_("key-id"),
1034+
N_("GPG-sign commits"),
1035+
PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
10351036
OPT_STRING_LIST(0, "whitespace", &whitespace,
10361037
N_("whitespace"), N_("passed to 'git apply'")),
10371038
OPT_SET_INT('C', 0, &opt_c, N_("passed to 'git apply'"),

0 commit comments

Comments
 (0)