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-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id B04F41F403 for ; Fri, 14 Oct 2022 08:57:01 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="I7xwPG28"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230004AbiJNI46 (ORCPT ); Fri, 14 Oct 2022 04:56:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229926AbiJNI4v (ORCPT ); Fri, 14 Oct 2022 04:56:51 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2077F14EC4D for ; Fri, 14 Oct 2022 01:56:50 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id i10-20020a1c3b0a000000b003c6c154d528so132441wma.4 for ; Fri, 14 Oct 2022 01:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=IVeQ/mWty2Tpibi+Iyhp7FnN8iq0Jx9ktGkbazpbcxU=; b=I7xwPG28TAbApnxYQG0l2vAwJShQ4SpsWJQbYRUEpXYR8bNARgMfNoSPJ19sztji/x 2Ej4EETUfWIKDj6t6iQ88JV6JzQl9EXbD22ePFdjQbMPDyk1KRO2DEN9Gq2mDiq5MnBi 0s0BRo19HmQxnnJgoQ0twgkbSkeceWjeZU9KbAFPfqlU0y++xRxGJ+eSiPu4elXLEyfb XbMrPa/YmSJNy3SimKapR1x/IaIhklXzwrkwA9VNxcO31MYeE7i3dvb1rTn/6hZER4Z1 XAD6fe+NYbEt1+HitE4a5Jrl2MUWa0lQMYy++gFIJSOlz7CBL+VRT/cvFr0mDMkG6Yqh mTYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IVeQ/mWty2Tpibi+Iyhp7FnN8iq0Jx9ktGkbazpbcxU=; b=dfItfRD4uelqRRTbyV4Bvz8d7hCn+H73Jf4oD/O88OGcXdcV4VwcCJyWIwSPm0yxKl 6AMjfah3rPBoA09qu8CSShaz6ckSf8P5I3olwAeoyd+QbtIwhYUQAnpGYxfTAQnMIuUV QzEA0jzQxtIUSwj5Xw4by58lIWXsP003UldbMpZsEgZjVlKYbDvoMyXcOCTI+U0eyz6r ln3eMHJbbkSOqr00cmhx1wBhbV2biLjkuK9tZ/eRFuiZ6KGa7WB8ZWwGG66YETFPQZqC ztdOLrvYb9o5RYxGtLvZMYsrOSNStUWwV7ziXfBBdjjXSJso3UJesqt2Cx6q18hqi3AE c4RA== X-Gm-Message-State: ACrzQf0fsUxpAxYn9wxtBn/PdInyfvFQXSmZeU7PYPWwOTQ0nGn89/tI iXlf8Af4zXNJoG8hg88juuDl+n49R3s= X-Google-Smtp-Source: AMsMyM7XprZBfRMoWX/xrwY3rnTK0Vi80wv/ILdYyIGoPM6IiEL57nndUSndSPoypNdx/+vsrl10NA== X-Received: by 2002:a05:600c:35cf:b0:3c6:e957:b403 with SMTP id r15-20020a05600c35cf00b003c6e957b403mr1201009wmq.162.1665737808344; Fri, 14 Oct 2022 01:56:48 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c7-20020a05600c0ac700b003c6bd12ac27sm1586618wmr.37.2022.10.14.01.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Oct 2022 01:56:47 -0700 (PDT) Message-Id: <25e28b7dab3f89039667c5317090510754b80964.1665737804.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jerry Zhang via GitGitGadget" Date: Fri, 14 Oct 2022 08:56:39 +0000 Subject: [PATCH v3 2/7] patch-id: use stable patch-id for rebases Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jerry Zhang , Jerry Zhang Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jerry Zhang Git doesn't persist patch-ids during the rebase process, so there is no need to specifically invoke the unstable variant. Use the stable logic for all internal patch-id calculations to minimize the number of code paths and improve test coverage. Signed-off-by: Jerry Zhang --- builtin/log.c | 2 +- diff.c | 12 ++++-------- diff.h | 2 +- patch-ids.c | 10 +++++----- patch-ids.h | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index ee19dc5d450..e72869afb36 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1763,7 +1763,7 @@ static void prepare_bases(struct base_tree_info *bases, struct object_id *patch_id; if (*commit_base_at(&commit_base, commit)) continue; - if (commit_patch_id(commit, &diffopt, &oid, 0, 1)) + if (commit_patch_id(commit, &diffopt, &oid, 0)) die(_("cannot get patch id")); ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id); patch_id = bases->patch_id + bases->nr_patch_id; diff --git a/diff.c b/diff.c index c15169e4b06..199b63dbcc3 100644 --- a/diff.c +++ b/diff.c @@ -6206,7 +6206,7 @@ static void patch_id_add_mode(git_hash_ctx *ctx, unsigned mode) } /* returns 0 upon success, and writes result into oid */ -static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable) +static int diff_get_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only) { struct diff_queue_struct *q = &diff_queued_diff; int i; @@ -6293,21 +6293,17 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid return error("unable to generate patch-id diff for %s", p->one->path); } - if (stable) - flush_one_hunk(oid, &ctx); + flush_one_hunk(oid, &ctx); } - if (!stable) - the_hash_algo->final_oid_fn(oid, &ctx); - return 0; } -int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only, int stable) +int diff_flush_patch_id(struct diff_options *options, struct object_id *oid, int diff_header_only) { struct diff_queue_struct *q = &diff_queued_diff; int i; - int result = diff_get_patch_id(options, oid, diff_header_only, stable); + int result = diff_get_patch_id(options, oid, diff_header_only); for (i = 0; i < q->nr; i++) diff_free_filepair(q->queue[i]); diff --git a/diff.h b/diff.h index 8ae18e5ab1e..fd33caeb25d 100644 --- a/diff.h +++ b/diff.h @@ -634,7 +634,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option); int run_diff_index(struct rev_info *revs, unsigned int option); int do_diff_cache(const struct object_id *, struct diff_options *); -int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int); +int diff_flush_patch_id(struct diff_options *, struct object_id *, int); void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx); int diff_result_code(struct diff_options *, int); diff --git a/patch-ids.c b/patch-ids.c index 46c6a8f3eab..31534466266 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -11,7 +11,7 @@ static int patch_id_defined(struct commit *commit) } int commit_patch_id(struct commit *commit, struct diff_options *options, - struct object_id *oid, int diff_header_only, int stable) + struct object_id *oid, int diff_header_only) { if (!patch_id_defined(commit)) return -1; @@ -22,7 +22,7 @@ int commit_patch_id(struct commit *commit, struct diff_options *options, else diff_root_tree_oid(&commit->object.oid, "", options); diffcore_std(options); - return diff_flush_patch_id(options, oid, diff_header_only, stable); + return diff_flush_patch_id(options, oid, diff_header_only); } /* @@ -48,11 +48,11 @@ static int patch_id_neq(const void *cmpfn_data, b = container_of(entry_or_key, struct patch_id, ent); if (is_null_oid(&a->patch_id) && - commit_patch_id(a->commit, opt, &a->patch_id, 0, 0)) + commit_patch_id(a->commit, opt, &a->patch_id, 0)) return error("Could not get patch ID for %s", oid_to_hex(&a->commit->object.oid)); if (is_null_oid(&b->patch_id) && - commit_patch_id(b->commit, opt, &b->patch_id, 0, 0)) + commit_patch_id(b->commit, opt, &b->patch_id, 0)) return error("Could not get patch ID for %s", oid_to_hex(&b->commit->object.oid)); return !oideq(&a->patch_id, &b->patch_id); @@ -82,7 +82,7 @@ static int init_patch_id_entry(struct patch_id *patch, struct object_id header_only_patch_id; patch->commit = commit; - if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0)) + if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1)) return -1; hashmap_entry_init(&patch->ent, oidhash(&header_only_patch_id)); diff --git a/patch-ids.h b/patch-ids.h index ab6c6a68047..490d7393716 100644 --- a/patch-ids.h +++ b/patch-ids.h @@ -20,7 +20,7 @@ struct patch_ids { }; int commit_patch_id(struct commit *commit, struct diff_options *options, - struct object_id *oid, int, int); + struct object_id *oid, int); int init_patch_ids(struct repository *, struct patch_ids *); int free_patch_ids(struct patch_ids *); -- gitgitgadget