From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 65C861F9FC for ; Fri, 19 Mar 2021 06:01:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233819AbhCSGAm (ORCPT ); Fri, 19 Mar 2021 02:00:42 -0400 Received: from mail-ej1-f41.google.com ([209.85.218.41]:44821 "EHLO mail-ej1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233756AbhCSGAg (ORCPT ); Fri, 19 Mar 2021 02:00:36 -0400 Received: by mail-ej1-f41.google.com with SMTP id b9so7757629ejc.11 for ; Thu, 18 Mar 2021 23:00:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=bdfmX3agsBDTgEdFeb9UOh0uC+HuSEf38YaM0Txw1Gw=; b=HAk+s8sH2jBNJKUnTo1jTM33nEFkCGe8LrBu5sxfXviR+MInSrwisnq480AJQ7lh0J Q8ijC+7mvLxYrQwxNzZc5YDi/u6IADIYLxiuSSdEH9sAkbGDk8A0HkuAdvOOZFW0zeqc b4FAjPKGUugjzrj3wGSa7nSDImpaW+6Ywb7O+DjdshRhPxHxxBDGesfZuuws2EGb45NJ v4FPvsE8HF/iLOOvPJV8J+k9weDdLr7ApV4E1emNVvhZWkWEmdUDQUzv0bqo5qtJILNf GrgpuOoFYOd3LD+V/z18qFbCGEYwIgQ+ks3ndrTSrkvNWmxOE44JpAny3yGNyD+aswzj V1KA== X-Gm-Message-State: AOAM5332154a5mqwUgT3fAECQT+Y4mBReCRHYFu6XbgMufFX5rn7pV8l ykCbvd886xJsiE2hnSoErzIyhGC000sV3LlaP74= X-Google-Smtp-Source: ABdhPJyLWeaI2OO0HJX5rHkf6tnjSzKBwaBdEQ+y7OqBZ4OUjfIBttmFdynPdBEDCIPoKfze69p1t9ebJ0QWYscjep8= X-Received: by 2002:a17:907:7684:: with SMTP id jv4mr2494124ejc.231.1616133635150; Thu, 18 Mar 2021 23:00:35 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Eric Sunshine Date: Fri, 19 Mar 2021 02:00:24 -0400 Message-ID: Subject: Re: [PATCH v6] format-patch: allow a non-integral version numbers To: ZheNing Hu via GitGitGadget Cc: Git List , Junio C Hamano , Denton Liu , =?UTF-8?B?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , ZheNing Hu Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Thu, Mar 18, 2021 at 2:00 AM ZheNing Hu via GitGitGadget wrote: > Usually we can only use `format-patch -v` to generate integral > version numbers patches, but sometimes a same fixup should be > labeled as a non-integral version like `v1.1`, so teach `format-patch` > to allow a non-integral version which may be helpful to send those > patches. > > `` can be any string, such as `-v1.1`. In the case where it > is a non-integral value, the "Range-diff" and "Interdiff" > headers will not include the previous version. > > Signed-off-by: ZheNing Hu > --- > diff --git a/builtin/log.c b/builtin/log.c > @@ -1662,13 +1662,18 @@ static void print_bases(struct base_tree_info *bases, FILE *file) > +static const char *diff_title(struct strbuf *sb, > + const char *reroll_count, > + const char *generic, > + const char *rerolled) > { > - if (reroll_count <= 0) > + int v; > + > + /* RFC may be v0, so allow -v1 to diff against v0 */ > + if (reroll_count && !strtol_i(reroll_count, 10, &v)) > + strbuf_addf(sb, rerolled, v - 1); > + else > strbuf_addstr(sb, generic); > - else /* RFC may be v0, so allow -v1 to diff against v0 */ > - strbuf_addf(sb, rerolled, reroll_count - 1); > return sb->buf; > } The comment about RFC and v0 doesn't really make sense anymore. Its original purpose was to explain why the `if` condition (which goes away with this patch) was `<=0` rather than `<=1`. It might make sense to keep the comment if the code is written like this: if (reroll_count && !strtol_i(reroll_count, 10, &v) && reroll_count >= 1) strbuf_addf(sb, rerolled, v - 1); else ... However, I'm not sure it's worth re-rolling just to make this change. Thanks.