Skip to content

A platform for community discussion. Free, open, simple.

DEV: Drop `--dirty` from `GitUtils.full_version` (#45111)

David Taylor8031a2ace4a9
diff --git a/lib/git_utils.rb b/lib/git_utils.rb
index fa04a2b0fd2..ee07cb7b9bb 100644
--- a/lib/git_utils.rb
+++ b/lib/git_utils.rb
@@ -19,7 +19,7 @@ class GitUtils
def self.full_version
filesystem_overrides["full_version"] ||
- try_git('git describe --dirty --match "v[0-9]*" 2> /dev/null', "unknown")
+ try_git('git describe --match "v[0-9]*" 2> /dev/null', "unknown")
end
def self.has_commit?(hash)
diff --git a/spec/lib/git_utils_spec.rb b/spec/lib/git_utils_spec.rb
index 5d955ae7363..2fc0ee7cc67 100644
--- a/spec/lib/git_utils_spec.rb
+++ b/spec/lib/git_utils_spec.rb
@@ -41,6 +41,16 @@ RSpec.describe GitUtils do
end
end
+ it "ignores working tree changes in full_version" do
+ within_temp_git_repo do
+ create_commit
+ run("git tag -a v1.0.0 -m 'Version 1.0.0'")
+ File.write("test.txt", "changed")
+
+ expect(GitUtils.full_version).to eq("v1.0.0")
+ end
+ end
+
it "returns fallback values when missing data" do
within_temp_git_repo do
create_commit