Don't trigger full rebuild if git is dirty (#60023)

(cherry picked from commit 6f2f7f5)

Author: IanButterworth

base/.gitignore

@@ -7,5 +7,6 @@
 /uv_constants.jl
 /version_git.jl
 /version_git.jl.phony
+/version_git_dirty
 /userimg.jl
 /JuliaSyntax

base/Makefile

@@ -306,4 +306,5 @@ clean:
 	-rm -f $(BUILDDIR)/file_constants.jl
 	-rm -f $(BUILDDIR)/version_git.jl
 	-rm -f $(BUILDDIR)/version_git.jl.phony
+	-rm -f $(BUILDDIR)/version_git_dirty
 	-rm -f $(build_private_libdir)/lib*.$(SHLIB_EXT)*

base/version_git.sh

@@ -6,7 +6,7 @@
 echo "# This file was autogenerated by base/version_git.sh"
 echo "struct GitVersionInfo"
 echo "    commit::String"
-echo "    commit_short::String"
+echo "    commit_short_raw::String"
 echo "    branch::String"
 echo "    build_number::Int"
 echo "    date_string::String"
@@ -17,6 +17,24 @@ echo "    build_system_commit::String"
 echo "    build_system_commit_short::String"
 echo "end"
 echo ""
+echo "function Base.getproperty(info::GitVersionInfo, s::Symbol)"
+echo "    if s === :commit_short"
+echo "        commit = getfield(info, :commit_short_raw)"
+echo "        dirty_file = joinpath(Sys.BINDIR, Base.DATAROOTDIR, \"julia\", \"base\", \"version_git_dirty\")"
+echo "        dirty_str = try"
+echo "            read(dirty_file, String)"
+echo "        catch"
+echo "            \"\""
+echo "        end"
+echo "        if strip(dirty_str) == \"true\""
+echo "            return commit * \"*\""
+echo "        end"
+echo "        return commit"
+echo "    else"
+echo "        return getfield(info, s)"
+echo "    end"
+echo "end"
+echo ""
 
 cd $1
 
@@ -38,8 +56,9 @@ git_time=$(git log -1 --pretty=format:%ct)
 commit=$(git rev-parse HEAD)
 commit_short=$(git rev-parse --short HEAD)
 if [ -n "$(git status --porcelain)" ]; then
-    # append dirty mark '*' if the repository has uncommitted changes
-    commit_short="$commit_short"*
+    dirty="true"
+else
+    dirty="false"
 fi
 
 # Our CI system checks commits out as a detached head, and so we must
@@ -117,3 +136,7 @@ echo "    $fork_master_timestamp.0,"
 echo "    \"$build_system_commit\","
 echo "    \"$build_system_commit_short\","
 echo ")"
+
+# Write dirty status to a separate file to avoid triggering rebuilds
+# when only the dirty status changes
+echo "$dirty" > version_git_dirty

stdlib/InteractiveUtils/src/InteractiveUtils.jl

@@ -102,7 +102,7 @@ See also: [`VERSION`](@ref).
 """
 function versioninfo(io::IO=stdout; verbose::Bool=false)
     println(io, "Julia Version $VERSION")
-    if !isempty(Base.GIT_VERSION_INFO.commit_short)
+    if !isempty(Base.GIT_VERSION_INFO.commit_short_raw)
         println(io, "Commit $(Base.GIT_VERSION_INFO.commit_short) ($(Base.GIT_VERSION_INFO.date_string))")
     end
     official_release = Base.TAGGED_RELEASE_BANNER == "Official https://julialang.org release"