Re: [PATCH v2 2/8] config: Reorganize get_color*.

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Feb 17, 2009, 01:00 UTC
Message-ID: <94a0d4530902161700n734b1ee0p22672757b978b850@mail.gmail.com>
In-Reply-To: <1234832094-15541-2-git-send-email-felipe.contreras@gmail.com>

On Tue, Feb 17, 2009 at 2:54 AM, Felipe Contreras <felipe.contreras@gmail.com> wrote:

> In preparation for parseopt.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---

<snip/>

Show 14 quoted lines

> @@ -274,12 +237,11 @@ static int get_colorbool(int argc, const char **argv)
>                        get_colorbool_found = git_use_color_default;
>        }
>
> -       if (argc == 1) {
> -               return get_colorbool_found ? 0 : 1;
> -       } else {
> +       if (print) {
>                printf("%s\n", get_colorbool_found ? "true" : "false");
>                return 0;
> -       }
> +       } else
> +               return get_colorbool_found ? 0 : 1;
>  }

<snip/>

Show 10 quoted lines

>                } else if (!strcmp(argv[1], "--get-colorbool")) {
> -                       return get_colorbool(argc-2, argv+2);
> +                       if (argc == 4)
> +                               stdout_is_tty = git_config_bool("command line", argv[3]);
> +                       else if (argc == 3)
> +                               stdout_is_tty = isatty(1);
> +                       else
> +                               usage(git_config_set_usage);
> +                       get_colorbool_slot = argv[2];
> +                       return get_colorbool(argc == 3);

Agh, crap, that should be argc != 3. Anyway, the next patch does it properly.

-- 
Felipe Contreras