Re: [PATCH 4/5] log: parse detached options like git log --grep foo

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jul 29, 2010, 22:25 UTC
Message-ID: <20100729222436.GA1824@burratino>
In-Reply-To: <1280391629-30017-5-git-send-email-Matthieu.Moy@imag.fr>

Hi,

Glance over this again:

Show 11 quoted lines

> +++ b/revision.c
> @@ -1382,12 +1400,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
>  		revs->grep_filter.fixed = 1;
>  	} else if (!strcmp(arg, "--all-match")) {
>  		revs->grep_filter.all_match = 1;
> -	} else if (!prefixcmp(arg, "--encoding=")) {
> -		arg += 11;
> +	} else if ((argcount = diff_long_opt("encoding", argv, &optarg))) {
>  		if (strcmp(arg, "none"))
> -			git_log_output_encoding = xstrdup(arg);
> +			git_log_output_encoding = xstrdup(optarg);

I think arg should be optarg in the string comparison, too. Sorry I didn’t notice last time.

I wonder why t3900 and t8005 do not catch this.

>  		else
>  			git_log_output_encoding = "";

Curious, Jonathan