Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Mike Mason <michael.w.mason@intel.com>
To:     marc.herbert@intel.com
Cc:     andy.work@nglowry.com, git@vger.kernel.org, gitster@pobox.com,
        josh@joshtriplett.org, linux-kbuild@vger.kernel.org,
        linux-kernel@vger.kernel.org, lists@nerdbynature.de,
        michael.w.mason@intel.com, peff@peff.net,
        nico-linuxsetlocalversion@schottelius.org
Subject: Re: Wrong -dirty suffix set by setlocalversion (was: BUG in git diff-index) 
Date:   Thu, 24 May 2018 16:03:34 -0700
Message-Id: <20180524230334.12452-1-michael.w.mason@intel.com>
In-Reply-To: <89d82c84-7a3b-9c4c-679e-a7a723669592@intel.com>
References: <89d82c84-7a3b-9c4c-679e-a7a723669592@intel.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

How about something like this? It ignores attributes that should have no
bearing on whether the kernel is considered dirty. Copied trees with no other
changes would no longer be marked with -dirty. Plus it works on read-only
media since no index updating is required.

Would this also be considered kosher, at least for the purposes of
setlocalversion?

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 71f39410691b..9da4c5e83285 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -73,8 +73,10 @@ scm_version()
 			printf -- '-svn%s' "`git svn find-rev $head`"
 		fi
 
-		# Check for uncommitted changes
-		if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then
+		# Check for uncommitted changes. Only check mtime and size.
+       # Ignore insequential ctime, uid, gid and inode differences.
+		if git -c "core.checkstat=minimal" diff-index --name-only HEAD | \
+				grep -qv "^scripts/package"; then
 			printf '%s' -dirty
 		fi