Re: [PATCH v4 3/3] Add support for -p/--patch to git-commit

From: Junio C Hamano <gitster@pobox.com>
Date: May 8, 2011, 19:27 UTC
Message-ID: <7vliyhro0z.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1304791087-2965-1-git-send-email-conrad.irwin@gmail.com>

Conrad Irwin <conrad.irwin@gmail.com> writes:

Show 21 quoted lines

> diff --git a/builtin/add.c b/builtin/add.c
> index d39a6ab..f02524b 100644
> --- a/builtin/add.c
> +++ b/builtin/add.c
> @@ -241,7 +241,7 @@ int run_add_interactive(const char *revision, const char *patch_mode,
>  	return status;
>  }
>  
> -int interactive_add(int argc, const char **argv, const char *prefix)
> +int interactive_add(int argc, const char **argv, const char *prefix, int patch)
>  {
>  	const char **pathspec = NULL;
>  
> @@ -252,7 +252,7 @@ int interactive_add(int argc, const char **argv, const char *prefix)
>  	}
>  
>  	return run_add_interactive(NULL,
> -				   patch_interactive ? "--patch" : NULL,
> +				   patch ? "--patch" : NULL,
>  				   pathspec);
>  }

This removes one reason for patch_interactive to be a file level global variable. Perhaps we should plan to move builtin_add_options[] and the file level global variables in builtin/add.c to cmd_add() and turn them into on-stack variables.

It obviously is a totally separate topic, though.