From patchwork Sun Mar 16 06:58:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 14018368 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F06041607A4 for ; Sun, 16 Mar 2025 06:59:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742108345; cv=none; b=aM03xF9WPfkirzC7XscWcqS8veiOBiqlqYJMskUxD0ACgBnqx27cy8jrOooaT5T+rp1zAwm+A/pvWP5nP168hEIRHAGSBX2WfVWZQNJotZGUtksccVgYK23ROwXC/U/wN5GDdvSN63ctTZL+B0SjOE/ug1vwoOJPQTCehrU4tz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742108345; c=relaxed/simple; bh=yHlLk9SgvXiUzsnoUISUW1/3AL21FRMC/Cu7Nxosh8k=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=upei1zUWmjAHCZsWPj9ZYz4bMaLslg7YzZ5evLgsMww84DWicmrp/1EWY7oNfnO3SrmqPM4Mah+yW7WoPnLcLpUEDgQrlg6UOtsHbiPPpoWO0IvJUZlzV6hGMDcs0580BEdd+Qqw8Mp46eDAwkJrv/EL41kXjlp00OX820E3uC4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fO8Oe4ma; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fO8Oe4ma" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3913d45a148so2894468f8f.3 for ; Sat, 15 Mar 2025 23:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742108341; x=1742713141; darn=vger.kernel.org; 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=CInsz9kDRFmiiZu/iUlaQANJTE+A5207nrZxmibar8g=; b=fO8Oe4maF7yursqGExJtjkx26WYXmlI0MIUr2kjT/kPd3jZ3eS6H9XDCbx1WrDob3K wX/SqFMpAWW5Y9Ba9p1PBOAgRcfwGezoDfYboeDC+Xs7vUX1F8zknfKQnbeaGeN/23AF JFFxMXa09w/hsB0iLEoXn06GNBKqPar7E3uux8ejH79KfdKWyusL7llAdukkPmnfaBBa 4HF5Xzbh/U7hKQWCVB6pIMvvqBgoh3arvkdYd6Q3n6piLVNwf/EgjhYMzcRZZPHGXPkr dxkhqn5OjlOnveiZt8g7cTl1rir0YNNtBMLbm4V2QPXrHfEUOv/DQUJkKEp+lZJTYZ3v tiQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742108341; x=1742713141; 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=CInsz9kDRFmiiZu/iUlaQANJTE+A5207nrZxmibar8g=; b=lyiWep9f4yScXl26RHdXTjQoRSM//SwnUlux/jlPoXRE0BBKquaTAQVMOUY3ZNtTD5 g/+AVPIpMtO3USS3Sy3NHNc+uAhYljySPFIt/1bskBczaL00C5YqULT3px+5eTHSSiBm T+XizXFuXCyquH/LGr2Iee7lJeInKq4aDDHFTbZHky+RDmKn4FS+hOj9gcgIZ+WHkRzO oim+JrC6D+HiAOz4YLkDnamARs/Ue0zI92tvfZprtqtnIN1OsZDqLbzwfKxHEbZ247Ea XeNZPqYQyPEWpITEDrfPxzaiOXEdgOfQIThlFWht2tdFN6PX2DB6Cg/AzRLEXuOQMg0w 1MeQ== X-Gm-Message-State: AOJu0Yy7Lk866deIXJN3jee8tLOpcLpXIBLdPdccsfqjsyfD9rEkobCw /X3KoAnECkCWWwNCOFUcvu6r/x5ackGxDGpmw8LiJWC+xLhxZM059GJS3g== X-Gm-Gg: ASbGncsWqVt3MgsoLq2zi/oNddUJI9Cf32vDusG6kZHh2ZMc9U3KqHpRoccmYONpwmr ytBUDU/TTAfwbXFuQgKfBFfHKudqgFXgRzyGGho7pX+S7ZrRlEt9yenXIVmQUA868laNqW0CBtf 49u7DiuQhuuf2iBnZ6BqqSdhg+qWnu20vi9nt+gG9M0ypvBQy0Mhh1NM2y5ZnKCuBIPoqdmLkw1 iUy8BmdgUOw6tDUQATS2vv6AX99zLDyKwcO4qnPa7/04CMiBIN9/ReqdzucIp9a01g9rN5ZffCF lGWcAWLND2j8nAKeKrdNl3yq4eMNci8uoW+714sdBvvCag== X-Google-Smtp-Source: AGHT+IG6uRYodR0/i1c4rRgb32rSTHZzD7MszZDk4/V8+ksttJphOetb1QLDO0//U0y6e5fu7l/cjA== X-Received: by 2002:a05:6000:156c:b0:391:456b:6ac8 with SMTP id ffacd0b85a97d-3971d8022f9mr10236435f8f.24.1742108341559; Sat, 15 Mar 2025 23:59:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-395c7df339asm11051715f8f.3.2025.03.15.23.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 23:59:00 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sun, 16 Mar 2025 06:58:55 +0000 Subject: [PATCH 1/5] stash: remove merge-recursive.h include Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren stash was modified to use merge_ort_nonrecursive() instead of merge_recursive_generic() back in commit 874cf2a60444 (stash: apply stash using 'merge_ort_nonrecursive()', 2022-05-10). That makes the inclusion of merge-recursive.h unnecessary. In preparation for the removal of merge-recursive.h, remove the unnecessary include. Signed-off-by: Elijah Newren --- builtin/stash.c | 1 - 1 file changed, 1 deletion(-) diff --git a/builtin/stash.c b/builtin/stash.c index dbaa999cf17..cfbd92852a6 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -13,7 +13,6 @@ #include "lockfile.h" #include "cache-tree.h" #include "unpack-trees.h" -#include "merge-recursive.h" #include "merge-ort-wrappers.h" #include "strvec.h" #include "run-command.h" From patchwork Sun Mar 16 06:58:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 14018369 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1697818CBFB for ; Sun, 16 Mar 2025 06:59:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742108347; cv=none; b=DBtrYbFonJe1rCSIqF5VQcEgWNNUbW9Kn8ESavm9yPKjj0Bn0yV1xXu4edifnpfN61NO5wQgbTaO9VqHNa6JAYnT7E8hdylAM1zCupHfpVf4zGZOIbjoJWpMpr469Hly/LpFcpQaqNUKdJ1RauKbaX2Aqp6xAbziEkTI/zK3tEw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742108347; c=relaxed/simple; bh=78hN4PthVj1QxCh61MB4ZqcfuzLVzeHnER2rlibQBx0=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=s/fxJgtcpZmNL/w9dQa0DQY4FEaLx8CKhUIP1DG0lDjlsEsndXXnEChutWvgFPUfqeI6BaGvGGx2TLngA6nME1iyayF9f4wt2ojFpbegAibcWfLrzJnlo4Jrrjwuu5XFzjvcopd/N5r9lXfq+SiZDaTTYiTeI2xxQpOxQ7N/r1Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MFEYqcU2; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MFEYqcU2" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-43ce71582e9so6552835e9.1 for ; Sat, 15 Mar 2025 23:59:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742108343; x=1742713143; darn=vger.kernel.org; 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=EHm3VFMdqqCNMIhC8e37imd+b/d+RUEFaSVMQN/hfus=; b=MFEYqcU26F9RItl1sHNoiqZD3A+jMrGyrtMesUSsN+5S5MEUt1o/j3ilQOA1kyNYAV +whek2DgaNnM8I+YIWqsaQr9yq1HdM5UwFV0xKa2OmcLJqTQOX+eu2NhsNcQ1rH9CA65 IV7CYhoAouOCn3JpelPqzlR0aC6G6jrdFM6YlRtXZoEn0rtrzq3U0SVsFRh2wx9AS4qK 2CpUGqs1QV01W3E83dLRMDulytC87ntxKqHnYMy4V/sVEdBbhytsVDP2Di86+oJ/3LAy 3EyPBmXDuAYI76WRWN6RuJs7RDXtKkyQFQT54sXT79An6BmCO+xWAcUzsDTEQnGI2uVF VkZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742108343; x=1742713143; 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=EHm3VFMdqqCNMIhC8e37imd+b/d+RUEFaSVMQN/hfus=; b=KWs7gNpwh/QKc0QUgcOzzfHs7zdb3ZDatJi83WsFGK8VHNciJNLZ4p8qDHHtxab+Yy 7B4Ai4pll68VkwphKZwzxZ6czqkNMHGVJfaOAWI4dhnCqcauITyC9wmjms3si7cbWvgd GBT1R+njc3ilWxp+2IT9erbaSOtFWpGkDIEMf4ChT3ekJMDzmiK2Ag/2E/BO2Lrij1OQ F0luN+9bzfGPkF7RKmAiObixx1QKSMuYGweqCenopIt/8ftG09o7OX9K5QENBddyaLVb GFe4M1tms7KIL+uyssF38CGOuyJJu/5hqOYvp5D1MHa0m7xVxPgrNAVZagRJQfF9y1An kivQ== X-Gm-Message-State: AOJu0Yz2SUwyyAgOSjRyHBM4m+x0N4ltIPRU/KMv4xguihj6oSO5GsN8 DctV1twJtpa22h93MyBmKuGkQJk3QjUzx4YCvdMpjJ8RZGb+JYEwEYDrZg== X-Gm-Gg: ASbGncuAO/A/b96bfkDNu366XaE6xBAQXIXAMl/c9YCq4aZxkJVA3cqlIM8eZisgeMM IbpR4E2/5ys/NcwBHen4wCyCC3olvg4GD97PZ6xnP9hyTfQRp+DSmnusTmQxruNVVrZrV++viK+ +j9nePFUEfXmQyG73Eg0UhwZ/+17P+ioRDiPMm6/OzdWysfczueK/C1Px/6TcpLeeMD9eyTsbXs J+O8WY9FPT4Q/xoXt+acs7RhLgBY+0IRZGMS725z3xNRIuhE2dMEvQFXDAVxiOLqYfmJtdNoBt2 gk/N9PM/ydUFbCKofIHLkKev8hgt5jVBrS4j1asARPBrLQ== X-Google-Smtp-Source: AGHT+IF9NMfzS++zUta0G08UQFVoFpOpIYhNmGUFPh136MHbG0Hz0zNQhjpr/L9XeaOA2jnIzX9zMA== X-Received: by 2002:a05:600c:198f:b0:43c:f928:71dd with SMTP id 5b1f17b1804b1-43d1ec646f5mr63836885e9.1.1742108342846; Sat, 15 Mar 2025 23:59:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-395c8975febsm11452494f8f.59.2025.03.15.23.59.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 23:59:02 -0700 (PDT) Message-Id: <0d42acaf5d45cd205abeb848670017d7253ab7ba.1742108339.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 16 Mar 2025 06:58:56 +0000 Subject: [PATCH 2/5] t6423: fix a comment that accidentally reversed two commits Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren The comment describing testcase 13b of t6423 somehow mixed up commits A and B in one paragraph. Fix the references. Signed-off-by: Elijah Newren --- t/t6423-merge-rename-directories.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh index 94080c65d12..ebf47cdd6b2 100755 --- a/t/t6423-merge-rename-directories.sh +++ b/t/t6423-merge-rename-directories.sh @@ -5549,9 +5549,9 @@ test_expect_success '13b(info): messages for transitive rename with conflicted c # Commit A: y/{b,c,d}, x/e # Commit B: z/{b,c,d}, x/e # Expected: y/{b,c,d}, x/e, with info or conflict messages for d -# A: renamed x/d -> z/d; B: renamed z/ -> y/ AND renamed x/d to y/d -# One could argue A had partial knowledge of what was done with -# d and B had full knowledge, but that's a slippery slope as +# B: renamed x/d -> z/d; A: renamed z/ -> y/ AND renamed x/d to y/d +# One could argue B had partial knowledge of what was done with +# d and A had full knowledge, but that's a slippery slope as # shown in testcase 13d. test_setup_13c () { From patchwork Sun Mar 16 06:58:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 14018370 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E10718D626 for ; Sun, 16 Mar 2025 06:59:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742108347; cv=none; b=XvrNBCaMu6Lv7Pjeuqgq/yf8F1xtvAUJR4Ixm71XBY9pJ2MaXabub/BuY++81Z6mfWoFR+x4sk0E/Qm6o1MP0ZlmwaRxhQ+r7/qS1L02c/gHsuQEfXdnDs6SVVWYDwuqOKmlE1tsVhvV7gwFODHNNTnRVZ7r5v/4asm81XeXT00= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742108347; c=relaxed/simple; bh=P0AihyQtwl+k4TA3rt8C/P4D9lb00MM93DtUo8WFoIA=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=QBmIa3XVAekdQMth+qozQsjSGWR+mSKDfMj8xBr2G132NawcVy7+7VtoZafYdtBotH7TLRWRuifNzTekLwDWsipdLae5ISft4nq6I1cq7td1omDJFh/gAZKrgSAaeggct69FaNfgX0It3pxjv9PvHoNu2Wkj3f30KhX/3k7Hik8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eYkzvglk; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eYkzvglk" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4394345e4d5so7205395e9.0 for ; Sat, 15 Mar 2025 23:59:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742108344; x=1742713144; darn=vger.kernel.org; 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=hllZ1uHsA8dJwFQtBkOFIWs9+0fnyx5kVbDHNJ2Mdtg=; b=eYkzvglkrldgTsuJeyNT97IbFjs9mbyq9QKxF1FTPzN6O2OSuCLFnv8U0f0V45xqy1 UsjjJ63jG72IEdDiv0i1298nTR0HsSbN+LHN9TmGlbic3kdveSiMcyhJg4Xl4HRjuhf+ 3lDU4/dHW8tdt4NhqRweObYCpkWrwk+WVD6Cxob9Ru57mraHf8oYzlLUYN7TPB7ZCZY6 0SJpX5ETDCKLWhsJ+ExPgPcY4UJCGT7XuqXFWa6uzau5NkTCilDhcFR8ISZwqHTgN6iN SMcBKV7tNLpSnBUrsvfAruO4vRytjdG1VkifonnZ/sK2B1MYS4Adqc5rWi7GfoKV/+yn 9aYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742108344; x=1742713144; 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=hllZ1uHsA8dJwFQtBkOFIWs9+0fnyx5kVbDHNJ2Mdtg=; b=B77xC0oW0jPOG9ur/uFwIJZ2XI5EENLJJ+lrZcvpQbLgDAZ87zNxcr/ZuMIsuEIFtP EABI2A91aU58YjHAuJil/QcIKMRUoksHox+cMpDauHB5pnRymWIdttnZr6zYu3vUD1fk 3LgYtJ7fgPsk4U/5Zyt4j5dq3Aela6BgJsW4IqHDNRDRxbcreCWZmoG1NcTrd4KPihPY pQIKJpkCOenP07jviFMwnQ5gKW9U9JL2dewjqmjMa9Elcgn1piOyi92g5V/7dqXZqD9P 5WPIYCxcIkVza87/0K8wc5R2SBV66N4RatG8y/6RjEzCTfGU7RiJeVEaQNtFCq8FeLuJ 8Cfg== X-Gm-Message-State: AOJu0YxVrjedpIlwWsRp/QUem0XjC7IopiAu/g8zA/7MvGG3vzMW/LxV rX/HoOWKxqjJr63IfR6djNyGulxMwxnDSbTcRKQMmFHSQKwun8iMTMvt2w== X-Gm-Gg: ASbGnctL635IqwLfh8X+MB0q4pDxmJTcIojznrA3dmj9ra9uC2dC5fnfBGlsRnggF0y wIvu4+9sRx6mKzOQE3r2rQ2wYgm3PcKHsv95IKQ1Rp6t8n5Q/56Z3zXrnfi4L2g/dQXqW+AXxi7 nlNrHVQfqD0Eq84p5MlLEV7h1trRlRuwg9fnwo+11eITqzN05Ctt77bQp4wLdKNM40cpFfcDBnk PXxhrE64u2m32OqYeX2PqdBZMncO9KFzCsfuqc3xdpBUCyNNBRBmWGkUzcFDUtP321Qqu5z7TiB QHVd9sQrT7bIUj9f4PvlQ40pdOwH4pQQ+1qViXN7ha10PA== X-Google-Smtp-Source: AGHT+IFXz7XhBbNRhbpjPBQHm6BLXi5Rhb/LFaSOwxfbAie2QGjdb6PVKM2vV6uxNqZFiVxFf8yjeA== X-Received: by 2002:a05:600d:1c:b0:43d:79:ae1b with SMTP id 5b1f17b1804b1-43d2018096amr100318325e9.14.1742108343498; Sat, 15 Mar 2025 23:59:03 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d200fad64sm69749515e9.25.2025.03.15.23.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 23:59:03 -0700 (PDT) Message-Id: <9f6a1669f39d26db8c9cd5c9db290f8708dce89b.1742108339.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 16 Mar 2025 06:58:57 +0000 Subject: [PATCH 3/5] t7615: be more explicit about diff algorithm used Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren t7615 is entirely about testing the differences about different diff algorithms, but it doesn't specify any diff algorithm when it is testing myers. Given that we have discussed potentially switching defaults (https://lore.kernel.org/git/xmqqed873vgn.fsf@gitster.g/), it makes sense in tests that are about different diff algorithms to be explicitly about which one is intended to be used in each test. Add that specificity. Signed-off-by: Elijah Newren --- t/t7615-diff-algo-with-mergy-operations.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7615-diff-algo-with-mergy-operations.sh b/t/t7615-diff-algo-with-mergy-operations.sh index 3b1aad0167a..ac5863e788c 100755 --- a/t/t7615-diff-algo-with-mergy-operations.sh +++ b/t/t7615-diff-algo-with-mergy-operations.sh @@ -26,7 +26,7 @@ GIT_TEST_MERGE_ALGORITHM=recursive test_expect_success 'merge c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm' ' git reset --hard c1 && - test_must_fail git merge -s recursive c2 + test_must_fail git merge -s recursive -Xdiff-algorithm=myers c2 ' test_expect_success 'merge c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram' ' @@ -42,7 +42,7 @@ test_expect_success 'merge c2 to c1 with recursive merge strategy succeeds with test_expect_success 'cherry-pick c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm' ' git reset --hard c1 && - test_must_fail git cherry-pick -s recursive c2 + test_must_fail git cherry-pick -s recursive -Xdiff-algorithm=myers c2 ' test_expect_success 'cherry-pick c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram' ' From patchwork Sun Mar 16 06:58:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 14018371 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 77E9118DB07 for ; Sun, 16 Mar 2025 06:59:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742108348; cv=none; b=EIg5/7rQZmkENTXz8j4TU+ZWdDQSH3oN/blrPuY1wSbgKTYX6akb2/Wvfzs+Ca4jSdeD9UIyqjFBdph67ZXnUjZ9VdCYQSFfpYAojfoX5jBx5IDWcVzfzrdxK4ilB1CKkvLKQMwc7de82CJsMpJqZo7gHF6eKGRonJab+AaW1Aw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742108348; c=relaxed/simple; bh=Qe6J1M+VTSx+DBvWYuiJMmLY9MSxlvidroncW2A9/N0=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=G00JGl3yWnT/9nDP40jckbkBpNDb7Y+wZSHocX/9v8hV1l4NWHYAIYUXGAu81C2GvPEPzu/zCYmj+FaC7YBWdBWSwWCQNRr7Plc6tp5D4U6Wof4tHqbfcrR32sJTWBhMbjxL+CoyRdpwQeKGMefmWsOwYkw1ScpvicVo49HC4yM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mBIZJBbp; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mBIZJBbp" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so1162515e9.1 for ; Sat, 15 Mar 2025 23:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742108344; x=1742713144; darn=vger.kernel.org; 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=Av5G7+2sI8ZZYyMpK6C4iIUMbJ4BzFe17X7p0gq9SSU=; b=mBIZJBbpVnCfYmpbtzTimwqXyfZO85NBgk4oa659tmIR9iZChOQdF3LFpgF6WCQAfU 98a8Oi5oJFeD4TW/nal7jVX1nbyO3U8HYwaP6kJITytq7xE00l9hg+v8HD/2Gv12UVeS 3YHCxsDEEOmcxDgUTrSvXd1uW3dCsjuCm5K6XULG8tzNjwOFwoi6J/O44+8W1WYGLdOI XcEcXG/u5hXKeF96wpC3hFBM+yJ2id5vgkm6kICXK2J4X7xETEbFpO1+oFKLPlYxjnDm MvImPMLYsWnWWwlMiG7gIBLJHjzJ+yl4kUvfXq2eKWJGfK0wO6mwuPMkJJJYC09PsfKl ToMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742108344; x=1742713144; 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=Av5G7+2sI8ZZYyMpK6C4iIUMbJ4BzFe17X7p0gq9SSU=; b=HxrxnuTbWKdJWfh4A8hGaQdVwVhPqHdSaefiPQ4XiPgv4RTMUJonTyFIh8F6faE6+B SuIrxNDXs0N1994qESm4DxdQeC5wXP6/cuxUTzTbY7hGfRZfR3liYBWa/fe+FeC3JQBH Qd0OkMU8rqes0bzHRLCzpz/PgGRFoSndhcYNZKO+39O3VP3db273KeyfHlKW41bLpdB7 WTWXBbyGwjhuocM9rr7NuTRYBSgsUljUa+rfYmV51qtNtOgCbeY5URWichTWO1IHZouD eCktr8CEia56td2VtMQnGJKxJS7ZIbpvbHorgf1EJDiDrXbuBYr35x7htFz6BlUPTa50 ubMg== X-Gm-Message-State: AOJu0YxXN4XJjZsKmFJ7bDLMkSLNr7ky8VGyuKKQ8T8GcaSjBy6bgFxR uCq/RQmQb7qEqNyI7Cgl6IRoi6O90sUZcurh/oI7R5er4vVbeMiQw+OAiQ== X-Gm-Gg: ASbGncuZD6RRi2Cx+/FDxGHS3lZn8rtNnlMTuy299t9p+MLfXOuZeX3wIiGgef1d3+7 lluHZ8+tw83IRy9v8kxpPFNYJ0Q4gZKvUoH9lR0Y6gOTqw+upzHbev7lz+1d9tlu1ItwLbPd+Lr skjjNeuXaNedjzIMNYXoI5KNp3ueqxEh8KyxiS9Npg6yRKgOcCaDJqjDjQ7bqawYFBYomvFeLAZ gwR6STHkuaY+jDnrGYQ2fhJfcjc7tLyYRQlPLQHzmZIv61Wcsz5iLkrgVm8ieVcSieZB5WJXiDj YgP0FazGMEeGa0EP+a9/smip0wNJLbxvxDlru3nXbWGlFw== X-Google-Smtp-Source: AGHT+IHP772vivxIYnT6vamWYIAoWV5EE+zjv/yhJsv5ofivfuHJyP6f+L9QgA/zD6JRYKekVIUreA== X-Received: by 2002:a05:600c:511c:b0:43c:fceb:91a with SMTP id 5b1f17b1804b1-43d1ec729a9mr107440935e9.11.1742108344154; Sat, 15 Mar 2025 23:59:04 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fe2927fsm69809145e9.18.2025.03.15.23.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 23:59:03 -0700 (PDT) Message-Id: <97fa3d73e88edb5d07ae073c4bf9afa521982600.1742108339.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 16 Mar 2025 06:58:58 +0000 Subject: [PATCH 4/5] merge-ort: fix accidental strset<->strintmap Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren Both strset_for_each_entry and strintmap_for_each_entry are macros that evaluate to the same thing, so they are technically interchangeable. However, the intent is that we use the one matching the variable type we are passing. Unfortunately, I somehow mistakenly got one of these wrong in 7bee6c100431 (merge-ort: avoid recursing into directories when we don't need to, 2021-07-16) -- possibly related to the fact that relevant_sources was initially a strset and later refactored into a strintmap. Correct which macro we use. Signed-off-by: Elijah Newren --- merge-ort.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/merge-ort.c b/merge-ort.c index 46e78c3ffa6..a12aa213b06 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1517,8 +1517,8 @@ static int handle_deferred_entries(struct merge_options *opt, struct strintmap copy; /* Loop over the set of paths we need to know rename info for */ - strset_for_each_entry(&renames->relevant_sources[side], - &iter, entry) { + strintmap_for_each_entry(&renames->relevant_sources[side], + &iter, entry) { char *rename_target, *dir, *dir_marker; struct strmap_entry *e; From patchwork Sun Mar 16 06:58:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 14018372 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4EC361607A4 for ; Sun, 16 Mar 2025 06:59:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742108349; cv=none; b=CSUQCmqzc5KVL2v0mws1gvIn5v8gph2xYNNIzxSE/xWAANfKP2uhbuWERNoER1w68z+CNOoORNaNbaEPg5h8TFVTGr4Rb8o86JNTuaGLzdLI/8qvuI86v406OPKKoyMPOw1mMTHf6lykUupy6NU0yg2AFJI6QedT29ueg/z0M1w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742108349; c=relaxed/simple; bh=r1D1q9vbFEDkxnTBkh84ndO2VKBQ6/xqNfpfON4jhKI=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=J1hdEgQjG2QPVQ55vXU+D9dSHStCKpPQHjWlXb6QwT+Y6d9frTKX84dBxU1HXFhydpp5JD0qUiSkJ0+J3RKqHJe+CUAog+fXPM8ET+EopegfW3bRrw65yeH5luRJyUpjx25QspBci90yEdNKZs+LGp7qw+45rO7F4kBnLOT+DTM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QRwi5s7e; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QRwi5s7e" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3913d45a148so2894492f8f.3 for ; Sat, 15 Mar 2025 23:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742108345; x=1742713145; darn=vger.kernel.org; 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=E0OTLFfr6Ixlpi/43DgGt8U/OrRG926lRjCOafepzBE=; b=QRwi5s7ekOOji9eUTjIFxTvRuicvWyQJDLLxZvgRXPfcPbAxW+8nemgvZcTZU9FDsr fgiJcRRXO3C3nxpyBWDkF9xTezydq3NMGkogGZDMgEPUNFu2DScf61bFzcRhADd2XFsT C12rivIAj907+V4TyLUPBR9ihe6O3DuVYgnsdiBNbjSPo4VjlhrtHDJ3i2lLqj6GSFGf X8RO/G7RrcEESvLXhSugsm9cmkINgVhDHN2CYR+3nAzamUqGWxE0IwG2cSMALRpJMmzv cHrfsSp52pb05SF5Ky6MQMRlF5c7EzH6vjmfAQoh4Vp9PDrPV8pCBZK+n6qHBPXaQ4aJ zOhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742108345; x=1742713145; 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=E0OTLFfr6Ixlpi/43DgGt8U/OrRG926lRjCOafepzBE=; b=pGXN0wQlPCWyR7w4rfeXH11mQcgOu/EvLzgcsjWXbj1HCu99rhDz++si1DZU1TAkkT oq+oLYupaXyF6+ahBLLyFgNmNyhRP9xh7hCFceT0XXsjEgDsNv7vz1Ip/4bA3ruGjufl 4MwUZ+Ayga7+tWQUfh/lmw7M2zeJiOK4YcbAOctocBWjO31bJuBrEuPk1pa5X1We5VT8 YLdsoXIFYaglCeDvt1D6V9Qa5zaewt5Z7Q366pD/1g90I9pOmdtZZZXm08ZOZMwVcIry 09ZPqJ6yEWpklSOTnKe0vUcv8kOoGIyvlS05qzyLugQtsH5JcGW8Q6z6x9gagJCVv3/L 45bg== X-Gm-Message-State: AOJu0Yz4fIfGzEdRmJNB0TpWIGYpi5Xy/n7iBgHSMHu+V0Tp2UsbmBPg yfySVno+MmVA5YVp9uUhAxaMRh6byxXiBkbNg+kqDPQsPRvfRy2idkSKmQ== X-Gm-Gg: ASbGncu+2wZOQKVqgC9PxtnxsVGEXwLGuTTZtPqL8tFMm84ey8t/owsIcmTvmbNv1wg zrVM4bx4lnUXEmrxaWD7WVDkIpiGs/6+sf2iBv85y+7xSYTLdK/tcesIN4981r66dudvpRm9aCX lxU2+rf+wMmaW+voRMcy8behHJ9s2d/n30pM1E5buaazssCqWjDmBdG/nMyMnWaDBhyRED7T6g3 rIdEzPZdYvS/VBOaxjJdTqpXvMy2VQyJQosqoCaJGIoQhiPXWgRZISyMI+8fiR2X57zSRzl9xem HzZUsj561WiNYWizjmMa9KrFKvCaOkXYtfyhJNVmLP4ghDML/7VusuDp X-Google-Smtp-Source: AGHT+IEKuFb+0uSSozmHBYGcKRcK+XkSD9eDUDk+AxkOKt3nSS4ZTv9l9PcZpjOCwMjw3mLPOtLBvg== X-Received: by 2002:a5d:6c6a:0:b0:390:f6aa:4e7c with SMTP id ffacd0b85a97d-3971dbe0f3emr7578780f8f.28.1742108345265; Sat, 15 Mar 2025 23:59:05 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-395c83b6e87sm11578127f8f.32.2025.03.15.23.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 23:59:04 -0700 (PDT) Message-Id: <456a30ff72a3126439e8253238423b37b772c914.1742108339.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 16 Mar 2025 06:58:59 +0000 Subject: [PATCH 5/5] merge-ort: remove extraneous word in comment Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren "is was" -> "was" Signed-off-by: Elijah Newren --- merge-ort.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/merge-ort.c b/merge-ort.c index a12aa213b06..9efc2285a94 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -3423,9 +3423,9 @@ static int collect_renames(struct merge_options *opt, /* * p->score comes back from diffcore_rename_extended() with - * the similarity of the renamed file. The similarity is - * was used to determine that the two files were related - * and are a rename, which we have already used, but beyond + * the similarity of the renamed file. The similarity was + * used to determine that the two files were related and + * are a rename, which we have already used, but beyond * that we have no use for the similarity. So p->score is * now irrelevant. However, process_renames() will need to * know which side of the merge this rename was associated