From d0034b1d75f205d85a0ca9416f997008c2d70bef Mon Sep 17 00:00:00 2001 From: Vince Broz Date: Thu, 3 Sep 2026 19:35:44 -0400 Subject: [PATCH] Bump overcommit to 0.72.0 for worktree merge fix Overcommit 0.71.0 resolves operation-state files (MERGE_HEAD, MERGE_MSG, MERGE_MODE) through `git rev-parse --git-common-dir`, which in a linked worktree points at the primary checkout's `.git` rather than the per-worktree directory where git actually writes them. store_merge_state therefore reads files that are not there, and restore_merge_state writes them back into the primary `.git`. Because clear_working_tree runs `git reset --hard` whenever overcommit stashes, a `git merge` followed by `git commit` from a linked worktree produces a single-parent commit whose subject still reads "Merge ...". Fixed upstream by sds/overcommit#887, released in v0.72.0, which adds Overcommit::Utils.git_path built on `git rev-parse --git-path` and routes the operation-state files through it. Gemfile.lock is gitignored here, so only the gemspec constraint changes. Locally the bump also tightens overcommit's own rexml dependency from >= 3.3.9 to >= 3.4.2 (CVE-2025-58767); the resolved rexml 3.4.4 already satisfied both. --- solargraph.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solargraph.gemspec b/solargraph.gemspec index 67e9d1294..281fd610c 100755 --- a/solargraph.gemspec +++ b/solargraph.gemspec @@ -65,7 +65,7 @@ Gem::Specification.new do |s| # # even more specific on RuboCop itself, which is written into _todo # file. - s.add_development_dependency 'overcommit', '~> 0.71.0' + s.add_development_dependency 'overcommit', '~> 0.72.0' s.add_development_dependency 'rubocop', '~> 1.80.0.0' s.add_development_dependency 'rubocop-rake', '~> 0.7.1' s.add_development_dependency 'rubocop-rspec', '~> 3.6.0'