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 20F0B1F54E for ; Mon, 1 Aug 2022 11:33:04 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ip9acQCr"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230443AbiHALc7 (ORCPT ); Mon, 1 Aug 2022 07:32:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229935AbiHALc6 (ORCPT ); Mon, 1 Aug 2022 07:32:58 -0400 Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AC1830F4B for ; Mon, 1 Aug 2022 04:32:57 -0700 (PDT) Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-10ea7d8fbf7so8098374fac.7 for ; Mon, 01 Aug 2022 04:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=yuB03W7/XMMrIuHzgAses3dy5/U3HRxziInw2txyhd8=; b=Ip9acQCrgFtNFworxS7cNvWvV0yJrF2aiUQsCVUe48w/iQkxC5/eQlS3yGU1DhXR3f rWcRAbhXXNWmjGPYdF5ysmBzSzElqPPzw8UPUjOy0WRfWJgkq858oaRlme21l1oI/MwX W+G2ff4p45Y3ca2BhR7jsQa5Mx4AQIx72QR8Sj3B4MsCftsOT1bQs86wf9aPuHcVVm5g LpVVkmICYqPtFdVghOcUuQGO5ovben5tONulCOKXNy8g66b4Va2/EW+FX1TTO0dCjzRf 0wL88nqspam9MvKJ9cTrwIgwB1ECdoD/rbmlJMpMVR2r32RzSW+c2dz5pnzeVWEtRWtH F4eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yuB03W7/XMMrIuHzgAses3dy5/U3HRxziInw2txyhd8=; b=t/wlsWG/3ewx+sVcl0owsNrUu/HJQZ0w/queIHld8icL1fGzxz0mfk6yjSdfuHT5+g UuF8DTs4C8g1mfLSqiqmrJt8QDgiUChHmmgKWELpQye0nmeCdhhAY6hBtE+Oix9+wVg4 ukXOPweHi0+xLGfMP6X+E9237MyAnYPLSObMYGibKqfwwIFRILQwp7D+UvwHTM57SIax GbB+Nu5bxGA8vC/3BjbYLNKi62AnEV7V2J0zIZ2jm6P5oTK5B8gKVq+NKOaHe50i151A +yvwYAEkmuzDVOfI8/8/ShXvaF2mdaLG23KC+tE4NhNYO9FraaMxYXpsuQOPBwcR0hHG UsEg== X-Gm-Message-State: AJIora+DEuH7JyK0xZdlSFOX9ceui+9qdgHl63wOTiwwDBsZ2Tp0NB1/ tve+oLaCyjF/8AnN5f5khhexhSwYM2h1wvl/qEg= X-Google-Smtp-Source: AGRyM1tukTyKEMS/4nzqAGWy1F5r7HwZtosCYM+khPlfodtrRYd+6qNKayerd63bA5Wlq5xYxcPmGNnjVnUaAjUsppc= X-Received: by 2002:a05:6870:738d:b0:10d:9757:ff2 with SMTP id z13-20020a056870738d00b0010d97570ff2mr7384898oam.251.1659353575822; Mon, 01 Aug 2022 04:32:55 -0700 (PDT) MIME-Version: 1.0 References: <20220729101245.6469-1-worldhello.net@gmail.com> <20220729101245.6469-7-worldhello.net@gmail.com> In-Reply-To: <20220729101245.6469-7-worldhello.net@gmail.com> From: Jiang Xin Date: Mon, 1 Aug 2022 19:32:44 +0800 Message-ID: Subject: Re: [PATCH 6/9] refs: add reflog_info to hold more fields for reflog entry To: Junio C Hamano , Patrick Steinhardt , Git List Cc: Jiang Xin Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Fri, Jul 29, 2022 at 6:12 PM Jiang Xin wrote: > > From: Jiang Xin > > The parameter "msg" of the functions "ref_transaction_add_update()" and > "refs_update_ref()" is used as a comment for creating a new reflog > entry. For some cases, like copying or renaming a branch, we may need > more custom fields for the new reflog entry, such as old-oid which is > different from the oid we get from the lock file. Therefore, we create > a new structure "reflog_info" to hold more custom fields for the new > reflog entry, and add two additional extended version functions. > > We will use this extension in a later commit to reimplement > "files_copy_or_rename_ref()" using "refs_update_ref_extended()" to > create new reference in a transaction and add proper reflog entry. > > Signed-off-by: Jiang Xin > --- > refs.c | 54 +++++++++++++++++++++++++++++++++++++++----- > refs.h | 20 ++++++++++++++++ > refs/debug.c | 2 +- > refs/files-backend.c | 14 ++++++++---- > refs/refs-internal.h | 17 ++++++++++++-- > 5 files changed, 94 insertions(+), 13 deletions(-) > > diff --git a/refs.c b/refs.c > index 48b69460e2..e53f011e6b 100644 > --- a/refs.c > +++ b/refs.c > @@ -1074,7 +1078,12 @@ struct ref_update *ref_transaction_add_update( > oidcpy(&update->new_oid, new_oid); > if (flags & REF_HAVE_OLD) > oidcpy(&update->old_oid, old_oid); > - update->msg = normalize_reflog_message(msg); > + if (reflog_info) { > + update->reflog_info = xmalloc(sizeof(*reflog_info)); Should be: update->reflog_info = xcalloc(1, sizeof(*reflog_info)); Will fix in v2. > + update->reflog_info->msg = normalize_reflog_message(reflog_info->msg); > + if (reflog_info->old_oid) > + update->reflog_info->old_oid = oiddup(reflog_info->old_oid); > + } > return update; > }