summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-09 18:21:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-09 18:21:19 (GMT)
commit0e0d717537547e8fcba441e4f65237c7fd227a34 (patch)
tree1cb5ad50202b03853e3baef2b26fd13a29df45ac /t/helper
parent9b7f726dfcf35d3a2dbfd150b64ca9b01e810b44 (diff)
parentaa416b22ea73321aba94c3c96db0491fb25ea7ea (diff)
downloadgit-0e0d717537547e8fcba441e4f65237c7fd227a34.zip
git-0e0d717537547e8fcba441e4f65237c7fd227a34.tar.gz
git-0e0d717537547e8fcba441e4f65237c7fd227a34.tar.bz2
Merge branch 'pb/am-show-current-patch'
"git am --short-current-patch" is a way to show the piece of e-mail for the stopped step, which is not suitable to directly feed "git apply" (it is designed to be a good "git am" input). It learned a new option to show only the patch part. * pb/am-show-current-patch: am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch am: support --show-current-patch=raw as a synonym for--show-current-patch am: convert "resume" variable to a struct parse-options: convert "command mode" to a flag parse-options: add testcases for OPT_CMDMODE()
Diffstat (limited to 't/helper')
-rw-r--r--t/helper/test-parse-options.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index af82db0..2051ce5 100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -121,6 +121,8 @@ int cmd__parse_options(int argc, const char **argv)
OPT_INTEGER('j', NULL, &integer, "get a integer, too"),
OPT_MAGNITUDE('m', "magnitude", &magnitude, "get a magnitude"),
OPT_SET_INT(0, "set23", &integer, "set integer to 23", 23),
+ OPT_CMDMODE(0, "mode1", &integer, "set integer to 1 (cmdmode option)", 1),
+ OPT_CMDMODE(0, "mode2", &integer, "set integer to 2 (cmdmode option)", 2),
OPT_CALLBACK('L', "length", &integer, "str",
"get length of <str>", length_callback),
OPT_FILENAME('F', "file", &file, "set file to <file>"),