mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
builtin/add.c: simplify boolean variables
Do not to explicitly initialize static variables to 0 and instead let BSS take care of it. Also use OPT_BOOL() to let the command line arguments set these variables to 0 or 1, instead of the deprecated OPT_BOOLEAN() aka OPT_COUNTUP(). Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5cae935660
commit
300c0a2209
|
@ -270,23 +270,23 @@ static struct lock_file lock_file;
|
|||
static const char ignore_error[] =
|
||||
N_("The following paths are ignored by one of your .gitignore files:\n");
|
||||
|
||||
static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
|
||||
static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0;
|
||||
static int verbose, show_only, ignored_too, refresh_only;
|
||||
static int ignore_add_errors, addremove, intent_to_add, ignore_missing;
|
||||
|
||||
static struct option builtin_add_options[] = {
|
||||
OPT__DRY_RUN(&show_only, N_("dry run")),
|
||||
OPT__VERBOSE(&verbose, N_("be verbose")),
|
||||
OPT_GROUP(""),
|
||||
OPT_BOOLEAN('i', "interactive", &add_interactive, N_("interactive picking")),
|
||||
OPT_BOOLEAN('p', "patch", &patch_interactive, N_("select hunks interactively")),
|
||||
OPT_BOOLEAN('e', "edit", &edit_interactive, N_("edit current diff and apply")),
|
||||
OPT_BOOL('i', "interactive", &add_interactive, N_("interactive picking")),
|
||||
OPT_BOOL('p', "patch", &patch_interactive, N_("select hunks interactively")),
|
||||
OPT_BOOL('e', "edit", &edit_interactive, N_("edit current diff and apply")),
|
||||
OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files")),
|
||||
OPT_BOOLEAN('u', "update", &take_worktree_changes, N_("update tracked files")),
|
||||
OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")),
|
||||
OPT_BOOLEAN('A', "all", &addremove, N_("add changes from all tracked and untracked files")),
|
||||
OPT_BOOLEAN( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")),
|
||||
OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")),
|
||||
OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
|
||||
OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")),
|
||||
OPT_BOOL('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")),
|
||||
OPT_BOOL('A', "all", &addremove, N_("add changes from all tracked and untracked files")),
|
||||
OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")),
|
||||
OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")),
|
||||
OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
|
||||
OPT_END(),
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue