From nobody Wed Jan 31 23:05:45 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 4TQHhN3kmSz58V7r for ; Wed, 31 Jan 2024 23:05:56 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQHhN1njVz4644 for ; Wed, 31 Jan 2024 23:05:56 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-51124e31f72so419995e87.0 for ; Wed, 31 Jan 2024 15:05:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706742354; x=1707347154; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZgrfDfZs3V/Ai2m84sVm5pq6JfJGBwuiIJZKpzbavzw=; b=oEodzS2Lqsohy74XcLmOUibl9CwGCvccUAds7V1wlH1scNfBaygPVsN1v/tYqw4xDw eJDO34ysD+Vj+zGyfzn1nDFXGbWdFmgkdNPzBTkhjghk+368xbiWhOynYpW4FKQE8qDG o2zNzJPYQWp+mpZfB7cQKksbcuzL3fYXR7KKLiL4MVQ1M+d4uVcM/EE4sYiTyXOy/pIR oQJ1sSMbk03R53YeyJlBqrlYT6z5H0/AE5krNgMgIhm/JdVs6yPpF/JLsreJDiVe/PQg Q2nWi+OYuyJCJP8340zICUM2F0G1QrdynA3u57f5XnN54iH1B4AYGvixvvN2q3tCziN3 vJ1Q== X-Gm-Message-State: AOJu0Yy6qG1hCUCeeER6CMT8SYe3SHFCmCLL+F+hyKgs2Ap5Ac39cCTK AzJHlfQdvoAiuFeSr38s7GcvaKfCoWV8z0gGYTX3gGaPa1poWeFvRQsj+/kP2Jw= X-Google-Smtp-Source: AGHT+IG8g1OexIwBocLq7m/g7oIQ34Ym6f4lLHCfKUOYPXcxLKQbpaIcvWn5xWMX+UH8JJ18EhMx5A== X-Received: by 2002:ac2:42d1:0:b0:511:1eb5:2269 with SMTP id n17-20020ac242d1000000b005111eb52269mr536602lfl.21.1706742354020; Wed, 31 Jan 2024 15:05:54 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id e17-20020a05600c4b9100b0040e3bdff98asm2678735wmp.23.2024.01.31.15.05.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jan 2024 15:05:53 -0800 (PST) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 From: Jessica Clarke In-Reply-To: Date: Wed, 31 Jan 2024 23:05:45 +0000 Cc: Gleb Smirnoff , Cy Schubert , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> To: Jung-uk Kim X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Queue-Id: 4TQHhN1njVz4644 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 31 Jan 2024, at 22:57, Jung-uk Kim wrote: >=20 > 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. >=20 > 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? :-( Yes, a plain git merge is wrong, what you=E2=80=99re looking for is git = subtree merge. There=E2=80=99s a section[1] in the Committer=E2=80=99s Guide = documenting the whole process. Note MFCs are different and should be cherry-picks like normal commits, albeit with slightly special options[2]. Jess [1] = https://docs.freebsd.org/en/articles/committers-guide/#vendor-import-git [2] = https://docs.freebsd.org/en/articles/committers-guide/#_mfc_a_vendor_impor= t