Re: [PATCH RFC 1/3] add: add new --exclude option to git add
- From
Torsten Bögershausen <tboegi@web.de>
- Date
- Mar 15, 2015, 17:51 UTC
- Message-ID
- <5505C6BD.5000809@web.de>
- In-Reply-To
- <1426427399-22423-1-git-send-email-kuleshovmail@gmail.com>
On 2015-03-15 14.49, Alexander Kuleshov wrote:
Thanks for working on Git, some minor remarks/suggestions inline.
> This patch introduces new --exclude option for the git add > command.
"This patch" is redundant. Shorter may be: Introduce the --exclude option for git add
> > We already have core.excludesfile configuration variable which indicates > a path to file which contains patterns to exclude. This patch provides
same here: Provide the ability to pass ....
> ability to pass --exclude option to the git add command to exclude paths > from command line in addition to which found in the ignore files.
"found" ?? Would "specified" be better?
Show 22 quoted lines
>
> Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
> ---
> builtin/add.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/builtin/add.c b/builtin/add.c
> index 3390933..5c602a6 100644
> --- a/builtin/add.c
> +++ b/builtin/add.c
> @@ -244,6 +244,16 @@ static int ignore_removal_cb(const struct option *opt, const char *arg, int unse
> return 0;
> }
>
> +struct string_list exclude_list = STRING_LIST_INIT_NODUP;
> +struct exclude_list *el;
> +
> +static int exclude_cb(const struct option *opt, const char *arg, int unset)
> +{
> + struct string_list *exclude_list = opt->value;
> + string_list_append(exclude_list, arg);
> + return 0;When we always return 0, the function can be void ?
Show 10 quoted lines
> +}
> +
> static struct option builtin_add_options[] = {
> OPT__DRY_RUN(&show_only, N_("dry run")),
> OPT__VERBOSE(&verbose, N_("be verbose")),
> @@ -255,6 +265,9 @@ static struct option builtin_add_options[] = {
> 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_explicit, N_("add changes from all tracked and untracked files")),
> + { OPTION_CALLBACK, 0, "exclude", &exclude_list, N_("pattern"),What does pattern mean ? Is it the same as a "pathspec", used in Documentation/git-add.txt
Show 10 quoted lines
> + N_("do no add files matching pattern to index"),
> + 0, exclude_cb },
> { OPTION_CALLBACK, 0, "ignore-removal", &addremove_explicit,
> NULL /* takes no arguments */,
> N_("ignore paths removed in the working tree (same as --no-all)"),
> @@ -298,6 +311,7 @@ static int add_files(struct dir_struct *dir, int flags)
>
> int cmd_add(int argc, const char **argv, const char *prefix)
> {
> + int i;Do we need "i" here ?
Show 5 quoted lines
> int exit_status = 0;
> struct pathspec pathspec;
> struct dir_struct dir;
> @@ -381,6 +395,11 @@ int cmd_add(int argc, const char **argv, const char *prefix)
> if (!ignored_too) {or could it be declared here ?
Show 18 quoted lines
> dir.flags |= DIR_COLLECT_IGNORED;
> setup_standard_excludes(&dir);
> +
> + el = add_exclude_list(&dir, EXC_CMDL, "--exclude option");
> + for (i = 0; i < exclude_list.nr; i++)
> + add_exclude(exclude_list.items[i].string, "", 0, el, -(i+1));
> +
> }
>
> memset(&empty_pathspec, 0, sizeof(empty_pathspec));
> @@ -446,5 +465,6 @@ finish:
> die(_("Unable to write new index file"));
> }
>
> + string_list_clear(&exclude_list, 0);
> return exit_status;
> }
>