From nobody Tue Sep 06 19:09:24 2022 X-Original-To: bugs@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 4MMZgm3XhNz4bT80 for ; Tue, 6 Sep 2022 19:09:24 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MMZgm1nsRz3cqS for ; Tue, 6 Sep 2022 19:09:24 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MMZgm0qyxzH12 for ; Tue, 6 Sep 2022 19:09:24 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 286J9OU1084650 for ; Tue, 6 Sep 2022 19:09:24 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 286J9OZv084649 for bugs@FreeBSD.org; Tue, 6 Sep 2022 19:09:24 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 229230] newvers falsely appends "-dirty" to hash when building in a git tree with no content changes Date: Tue, 06 Sep 2022 19:09:24 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: misc X-Bugzilla-Version: CURRENT X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: commit-hook@FreeBSD.org X-Bugzilla-Status: Closed X-Bugzilla-Resolution: FIXED X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-bugs@freebsd.org MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662491364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jIYNUTqEC70onFqlRbUQqno5wICb+8wDAWhAsift9K0=; b=A7ptOXfaNA/O1HGKQun3MjJKZDkV+g6jGEt2CwJ88axkMEO9VKenSlz9UXIONxVDw83p2f 7wCWpK2mmyRZ3ZgxcZg3NdALdOwCCHMxNyj5GvksBPrg1tZX3geiulpEZlmzFUkCJ8Yn5x K20anFQOFfMaeLY2V0mitOKs89V6W07NpscWCSTvjw7o6pAksab69m4b4m9xEL7NunIHhs ue3oh5gnuxJCq81q8oj9djMZwM5Sjd230XIhHC344NNBsq83THSpO4UaTATZvicMH1P/uo r+Pw+M53KhKtYMdfIbt5rB+oHVbxR7rnG5/+DoVq7yQqWxnLN/2FKCjGrjjmaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662491364; a=rsa-sha256; cv=none; b=HwqJhtvNgrA2m11njX9kPygvCbrsuldNuJDoJ8s+ivbhE7/WvuGNpJ3yBFZffhlWjEgs1c 8O0TRmxrA37go2/K0id4eRgz1hDWOydRzxgQG9xb3a3M0iDXrUBkEIvRgfaTpRuxy+mtO4 Zw+7vyvHMr95Nbc3umIFgCKO2e8E3pxnwIY7xz8d0ZBvbQ+D4i+qpoZwJmrKxPcxYaVywn WkVZdFqb6Z5d392SMeIPoalfDGcYDRjN+UP2YH6QA1WMYQ547+0H6uVTNjfXNAyyWTakUV rC4Tn9PI2tPLJBRMLl0oK1VBCtX2TTrtfQPvv2tUDWkZpM1ZdfCLa4OlRWPr8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D229230 --- Comment #3 from commit-hook@FreeBSD.org --- A commit in branch stable/12 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3Db67bd2859d7d757ee9ceb8269a5790f4f= 1091be5 commit b67bd2859d7d757ee9ceb8269a5790f4f1091be5 Author: Ed Maste AuthorDate: 2018-11-02 21:20:46 +0000 Commit: Ed Maste CommitDate: 2022-09-06 17:15:05 +0000 newvers.sh: fix git false positive -dirty tag Assuming that any output from `git diff-index --name-only` implies changes in the working tree results in false positives: files with metadata, but not content, changes are also listed. Check that content differences exist before adding the -dirty tag to the git hash. PR: 229230 Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D15968 (cherry picked from commit 50b53a8dc35f38ab6920dd83409541e875d01551) (cherry picked from commit 5186028dc4a2a74d007fa65857667efb2742eaea) sys/conf/newvers.sh | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) --=20 You are receiving this mail because: You are the assignee for the bug.=