Re: [PATCH 18/18] revert: Introduce --continue to continue the operation
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 27, 2011, 22:52 UTC
- Message-ID
- <7vk4b3mj4r.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1311736755-24205-19-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 12 quoted lines
> @@ -109,14 +108,40 @@ static void verify_opt_compatible(const char *me, const char *base_opt, ...)
> va_end(ap);
> }
>
> +static void verify_opt_mutually_compatible(const char *me, ...)
> +{
> + const char *opt1, *opt2;
> + va_list ap;
> + int set;
> +
> + va_start(ap, me);
> + while ((opt1 = va_arg(ap, const char *))) {(style) Many lines indented with SP thoughout the patch.
Show 5 quoted lines
> + set = va_arg(ap, int); > + if (set) > + break; > + } > + if (!opt1)