summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-03-17 17:22:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-17 18:54:50 (GMT)
commite4770f67d16c1970fa175bddfd4ca40258e57f22 (patch)
tree4d9a5a7ee0a194bb67d49213f8a35588a2976be6 /builtin
parentbe80a2392f5d10395bf934a066faeefdb6bb380a (diff)
downloadgit-e4770f67d16c1970fa175bddfd4ca40258e57f22.zip
git-e4770f67d16c1970fa175bddfd4ca40258e57f22.tar.gz
git-e4770f67d16c1970fa175bddfd4ca40258e57f22.tar.bz2
ls-files: fix typo in variable name
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/ls-files.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 1c0f057..ca5b48d 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -30,7 +30,7 @@ static int line_terminator = '\n';
static int debug_mode;
static int show_eol;
static int recurse_submodules;
-static struct argv_array submodules_options = ARGV_ARRAY_INIT;
+static struct argv_array submodule_options = ARGV_ARRAY_INIT;
static const char *prefix;
static const char *super_prefix;
@@ -175,17 +175,17 @@ static void show_killed_files(struct dir_struct *dir)
static void compile_submodule_options(const struct dir_struct *dir, int show_tag)
{
if (line_terminator == '\0')
- argv_array_push(&submodules_options, "-z");
+ argv_array_push(&submodule_options, "-z");
if (show_tag)
- argv_array_push(&submodules_options, "-t");
+ argv_array_push(&submodule_options, "-t");
if (show_valid_bit)
- argv_array_push(&submodules_options, "-v");
+ argv_array_push(&submodule_options, "-v");
if (show_cached)
- argv_array_push(&submodules_options, "--cached");
+ argv_array_push(&submodule_options, "--cached");
if (show_eol)
- argv_array_push(&submodules_options, "--eol");
+ argv_array_push(&submodule_options, "--eol");
if (debug_mode)
- argv_array_push(&submodules_options, "--debug");
+ argv_array_push(&submodule_options, "--debug");
}
/**
@@ -204,7 +204,7 @@ static void show_gitlink(const struct cache_entry *ce)
argv_array_push(&cp.args, "--recurse-submodules");
/* add supported options */
- argv_array_pushv(&cp.args, submodules_options.argv);
+ argv_array_pushv(&cp.args, submodule_options.argv);
/*
* Pass in the original pathspec args. The submodule will be