kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

ls-files: fix typo in variable name 

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brandon Williams 2017-03-17 10:22:56 -07:00 committed by Junio C Hamano
parent be80a2392f
commit e4770f67d1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/ls-files.c
View File

@ -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