From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from secure.elehost.com (secure.elehost.com [185.209.179.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4151E2750FB for ; Fri, 21 Nov 2025 13:18:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.209.179.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763731117; cv=none; b=Yg+aYl5B9bx0XW1pOaqdkT3dIes7QC48FLx2SibwCwi2jtWcXpJQ3rPAKJ95oI9ufEc/rlaFY3heog/I3SeMWeqfGLzRShr86TML8GIeYbKfVZU/9Y1J7KPm69tTnORHYUWX5oZe1w/8sZn75lyF1jaxqYFWbqqHxXzYT5c90nU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763731117; c=relaxed/simple; bh=U6XAeXge7oZJseKfDNl5fI/n1lwQiv+Wj+kWyebWv0A=; h=From:To:References:In-Reply-To:Subject:Date:Message-ID: MIME-Version:Content-Type; b=ZZ5OyUiWy/9y7RKEkrcTpqfHAYpO9mc+mfcwB2c35pJ2Y3zAwfbMQmccl7duXwFla5JmJnNEu28ccfGir+Pjry40U7qaz7oqBxwlEEpmbKyEe3rGnN6fhgQOQtDRw8Ji5/9gr7seOGT544ScKc6YpEatqsk2V90uoikf/gVuKwc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=nexbridge.com; spf=pass smtp.mailfrom=nexbridge.com; arc=none smtp.client-ip=185.209.179.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=nexbridge.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nexbridge.com X-Virus-Scanned: Debian amavisd-new at secure.elehost.com Received: from Mazikeen (pool-99-228-67-183.cpe.net.cable.rogers.com [99.228.67.183]) (authenticated bits=0) by secure.elehost.com (8.15.2/8.15.2/Debian-22ubuntu3) with ESMTPSA id 5ALDITMD2196961 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Nov 2025 13:18:30 GMT Reply-To: From: To: "'Kristoffer Haugsbakk'" , References: <003901dc596c$40bfbd80$c23f3880$@nexbridge.com> <94d81164-5af5-471e-a403-f2d544796d18@app.fastmail.com> In-Reply-To: <94d81164-5af5-471e-a403-f2d544796d18@app.fastmail.com> Subject: RE: [BUG] Test Failure 2.52.0, t8020.16,19 Date: Fri, 21 Nov 2025 08:18:24 -0500 Organization: Nexbridge Inc. Message-ID: <014801dc5ae9$543c73c0$fcb55b40$@nexbridge.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 16.0 Content-Language: en-ca Thread-Index: AQFDHHm2se7imlkNauYXEvAe+CtXBwNzej23thP9RXA= X-Antivirus: Norton (VPS 251121-4, 11/21/2025), Outbound message X-Antivirus-Status: Clean On November 19, 2025 11:25 AM, Kristoffer Haugsbakk wrote: >On Wed, Nov 19, 2025, at 16:50, rsbecker@nexbridge.com wrote: >> The following two failures appeared on NonStop for the actual release. I did >> not see them in -rc0 or after (doesn't mean they didn't happen after rc0). >> To my eyes, this looks like a real issue not just on NonStop. It is 100% >> reproducible and is not transient. The build is with OpenSSL 3.4, but that >> should not matter. >> >> expecting success of 8020.16 'cross merge boundaries in blaming': >> git checkout HEAD^0 && >> git rm -rf . && >> test_commit m1 && >> git checkout HEAD^ && >> git rm -rf . && >> test_commit m2 && >> git merge m1 && >> check_last_modified <<-\EOF >> m2 m2.t >> m1 m1.t >> EOF >>[snip] > >Also reported here https://lore.kernel.org/git/4dc4c8cd-c0cc-4784-8fcf- >defa3a051087@mit.edu/ As a packager for NonStop, my team and I are trying to determine whether 2.52.0 can actually be shipped. The concern is, is this a defect in the test code or underlying git merge code, and if the latter, how big an impact. If we hold off, how long will it take for a fix (approximately). I do not know the merge code, so...