From nobody Wed Jan 31 22:57:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQHV53ZWpz58TKX; Wed, 31 Jan 2024 22:57:01 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQHV532GRz45FJ; Wed, 31 Jan 2024 22:57:01 +0000 (UTC) (envelope-from jkim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706741821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HynYAlE3BQoi73W4YWlfneYJYgds0pplIzh3/qSFT5w=; b=sdveVgd0jErJq0fy+EPp/XmbL7i0pGyjodUJMU5ID2mgDaBSX4kiWN6O6nBLLNUlmVi2nj ArXVlFYBMjtsamBb+X/n72OMtUOCsZOF7KYV650eIwPYGepq5/9DRVxrB6BB9BnnhE4UUY WfSVJUQKQv3vLYM0W4wW5NuLGB15oYqdEu2fips+ZdlMX0CNyLTeisrGzPn/3ODFE3JLVu YiIl/SJEaqNbJ8WCYRWBB4xXUpgafVzqwvnRXFbrI3Qm8M4KgjvJ9GihysWND3NndbCuAI +Ss29r7/F4hVfnMrhwR6SbgYkDl/SvXQrsvW20ef82xd/rw8jtrTOxf6MOTmUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706741821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HynYAlE3BQoi73W4YWlfneYJYgds0pplIzh3/qSFT5w=; b=AvUa7ki7DeQiUkhXVNNQkhoVMdm0LhnaLj0jOZdgRwAsj676YDd37whkOKNrRC3CBInA6a QuiC7W9ABIyYHVWQA43qq8MIvjnqykrxDeVYq7Q6PDTDJZEO4WueN4mRMhp3lHzK7IIgYF 8lsSN+D1qmnOwMygY56ekDW3E2U+8g1xxl1FoGIEMTlmJIUv+X+VJI/TsO0Bwi5mOx589H bXLUlPgZBevjUgq/jpV99EdPp25D9WsQkqYe2cvBd9IN3r6AY8nqRQsIMlR/X2ohWEs/pj A3J+gg7+d89kDZt5TorKM58WrZI88PRYqRn7wPJNdk/FJ8wZh785a72hEUld+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706741821; a=rsa-sha256; cv=none; b=KCVicdDELa9lvjX7ZEaNgiWrAI1gywM2RNxIkJVARrJ2y4KozlXP/N/V6eRNCgiN+a0uoZ nUuf2OP5XiWumZLySa9WwVr7NCz8DBNYmVQq1+9593Oqg3yWXI1EL7qTBLO6wV4eI+VFAb QARdDJvJ0HAFA8e81Uj/D9p49HVOZllFUprfA0sH54i5yyhUaWzAmmCnmoxWw19l3uuTvy g/p+naQu0OzCVHNYhoAjBLmQ9i4MFQoDDnkMkKqxPL9/bhWAt/6XnQWDCefH7RawWiMsVI Y5pS2qHAShGy1x+3431ZgSWMC6JCAN10g5lzVK106MJcIp3zr5UfqPursauu7g== Received: from freefall.freebsd.org (pool-108-53-202-102.nwrknj.fios.verizon.net [108.53.202.102]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jkim/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TQHV51VjCz15D4; Wed, 31 Jan 2024 22:57:01 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Message-ID: Date: Wed, 31 Jan 2024 17:57:00 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 Content-Language: en-US To: Gleb Smirnoff , Cy Schubert Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> From: Jung-uk Kim Organization: FreeBSD.org In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 24. 1. 31., Gleb Smirnoff wrote: > On Tue, Jan 30, 2024 at 08:57:10PM -0800, Cy Schubert wrote: > C> > > commit 722b16673c40aedf280895f2f2f676bb494518d7 > C> > > Author: Jung-uk Kim > C> > > AuthorDate: 2024-01-30 21:43:45 +0000 > C> > > Commit: Jung-uk Kim > C> > > CommitDate: 2024-01-31 03:16:36 +0000 > C> > > > C> > > acpica: Import ACPICA 20230331 > C> > > > C> > > (cherry picked from commit 8e013e1e3b81740266738226667431cf5c28b17a) > C> > > C> > Cherry-pick not merge for a vendor merge?.. > C> > C> Probably not Kosher but, a general git question about cherry-picks vs > C> merges. A cherry-pick, without the -x but specifying the source branch, > C> results in no cherry picked merge but a merge of the last commit of the > C> source branch to the current branch. > C> > C> Can someone explain this? And if this would be any different from a > C> merge from a branch that is ahead by one commit since the last merge? > > The object hashes would be the same, but the second parent meta-data > is basically lost, although can be recorded in the commit text > message with -x. > > The second parent is important. When searching for regressions you may > go into bisecting the acpica history instead of FreeBSD history once > you figured out that this is the merge that brough the regression. With > second parent this can be automated and in case of manual search still > easier to do. > > So, please don't do cherry-picks instead of merges for vendor subprojects. In very early days of git adoption, I once did "git merge" from vendor branch by the git primer and it broke git repo. At the time, someone (imp?) had to manually fix it and I was told that I should never ever do "git merge". Am I confused again? :-( Jung-uk Kim