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 44B641F506 for ; Tue, 20 Sep 2022 06:21:25 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dM0S3iJY"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229987AbiITGVK (ORCPT ); Tue, 20 Sep 2022 02:21:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230124AbiITGVF (ORCPT ); Tue, 20 Sep 2022 02:21:05 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 660D05A3D1 for ; Mon, 19 Sep 2022 23:21:04 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id t7so2507296wrm.10 for ; Mon, 19 Sep 2022 23:21:04 -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; bh=SOiiPUIYbrvMwWfRhgb+ou73geqYo5qARk05+QZo108=; b=dM0S3iJYEd6FgYjPlNGQ9BqaShdoSED3GmGCUv891okHeoUQqVjfkplT2FuJ2tG5AP 1WzEehoBEhr/BtXSVyRPE6BUwuc6jHplUHUvoyTtFQWfGyt7MqM5kGYQxtCsBz5D26ud EgFe458j7msb7rxt2Jw9pOS00k3vyicgWFTGnHu5jcR+znmPk7QDtC1MptlgVxNdCIKj dHJxc73jdbWK/Ywwrra6Mssx0lkYL6VUklUQOP2XqPRO/vppXyxb8nbEa3HliinnD4eH it4HVpLPw8Sq8IvivryachkOczydfSQw2+55Z9Kop2oG50gbqwRyJ2bFYWWSRlk80Mde qSvg== 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; bh=SOiiPUIYbrvMwWfRhgb+ou73geqYo5qARk05+QZo108=; b=Ub+o7j6dxb1vz7ZfYq+Cbu0+QqmpkD6I0JfdQ3NdZLzsZ3SjwyFpLN78ZjZsrOp3LR 4TyzfKiPaDsdhFaJbvkFflFED1Cs3h+lJH7PSHk0yLVdQl9W5HLa39YxwDYeC3ETFN8e 0Vgnof/aLOaNk+j7aIEBYZQJu0jQMPwPW2e5ZkZNOEByfF4fZN6TdxPkznPSxDFJK8UE CXFHMtVZoJt0d9peBOy9nO10l25gQSHhgwkGBih1VbXMajdaqCrpkECg8+RQdTtUYQO+ fAADNtpFJ2Pv2SOIQ9hQVXazi2f50k4cgtyz6L6v0fAXTq1hljsL5F7yH/LWnLEGWM54 PzDA== X-Gm-Message-State: ACrzQf13T2QmdpW/80C7aerKbgfn8QnhE8FqrUVMbFhDduOA5aEq+IVc xuf1mgG+R6HghEU97xFExiTRh9lg8n8= X-Google-Smtp-Source: AMsMyM78Tw9SSRvmKhYXprTNcxQ1FzR5ZoglQ+vO6a2dKdoUudMrWwv+49zOE+nE8SylrJ2T6ysvyQ== X-Received: by 2002:a5d:5988:0:b0:22a:f8cc:386a with SMTP id n8-20020a5d5988000000b0022af8cc386amr6337882wri.365.1663654862636; Mon, 19 Sep 2022 23:21:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id be12-20020a05600c1e8c00b003b3307fb98fsm1010537wmb.24.2022.09.19.23.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Sep 2022 23:21:02 -0700 (PDT) Message-Id: <30ec43cd129b626373f1886592f0040027586da6.1663654859.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jerry Zhang via GitGitGadget" Date: Tue, 20 Sep 2022 06:20:59 +0000 Subject: [PATCH v2 2/2] 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. This allows the legacy unstable id logic to be cleaned up. 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 047f9e5278d..3bb49fd7406 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1762,7 +1762,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 70bc1902e11..f00522d9354 100644 --- a/diff.c +++ b/diff.c @@ -6185,7 +6185,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; @@ -6268,21 +6268,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 8bf425555de..fefddc487e9 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