Merge branch 'pw/stash-all-parseopt-fix' into jch
Fix definition for the "--all" option to use symbolic constant in the options[] array passed to parse_options API. * pw/stash-all-parseopt-fix: stash: use named constant when parsing "--all"jch
commit
40d5c3c400
|
|
@ -1888,7 +1888,7 @@ static int push_stash(int argc, const char **argv, const char *prefix,
|
|||
OPT_BOOL('u', "include-untracked", &include_untracked,
|
||||
N_("include untracked files in stash")),
|
||||
OPT_SET_INT('a', "all", &include_untracked,
|
||||
N_("include ignore files"), 2),
|
||||
N_("include ignore files"), INCLUDE_ALL_FILES),
|
||||
OPT_STRING('m', "message", &stash_msg, N_("message"),
|
||||
N_("stash message")),
|
||||
OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
|
||||
|
|
@ -1995,7 +1995,7 @@ static int save_stash(int argc, const char **argv, const char *prefix,
|
|||
OPT_BOOL('u', "include-untracked", &include_untracked,
|
||||
N_("include untracked files in stash")),
|
||||
OPT_SET_INT('a', "all", &include_untracked,
|
||||
N_("include ignore files"), 2),
|
||||
N_("include ignore files"), INCLUDE_ALL_FILES),
|
||||
OPT_STRING('m', "message", &stash_msg, "message",
|
||||
N_("stash message")),
|
||||
OPT_END()
|
||||
|
|
|
|||
Loading…
Reference in New Issue