You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
refactor(git-core): merge git-worktrees into git-core as a package - #46
Removes the Maven module git-worktrees and makes its code the package de.cuioss.git.document.core.worktrees of git-core, before the first release. The change is a move: no worktree operation changes its behaviour, outcome or message text.
Intent
Problem.git-worktrees is a second module that adds no third-party dependency and is about 1,700 lines against about 5,000 in git-core. Every plan has paid for the second module again: an Enforcer block, a domain-term test, a specification, and build and metadata decisions. Module coordinates are cheapest to change before 0.1.0.
Approach. Move the code as the package de.cuioss.git.document.core.worktrees of git-core (git mv, behaviour unchanged). GitWorktreesLogMessages merges into GitCoreLogMessages (INFO 2-4, WARN 102-104; the worktrees refusal stays a separate record, WORKTREE_CAPABILITY_REFUSED = 102). The worktrees requirements are renumbered GDR-WT-1..4 to GDR-CORE-12..15 and ADR-0004 is rewritten in place (both owner decisions). The specification, all documents and the dependency-graph SVG follow the merged module. The test count goes from 883 to 882: the only deleted test is the duplicate git-worktreesDomainTermAbsenceTest.
Non-goals. No behaviour change in any worktree operation. No dependency added or removed; consumer-isolation and module-layering are unchanged. .github/project.yml is untouched, so this is not a release. git-store does not depend on the worktrees package.
Changes
Code and tests: the worktrees classes and their seven test classes move from git-worktrees into git-core (git mv); git-core/src/main/java/module-info.java exports both packages.
GitWorktreesLogMessages is merged into GitCoreLogMessages (INFO 2-4, WARN 102-104) and git-worktrees/doc/LogMessages.adoc into git-core/doc/LogMessages.adoc; GitOutcome Javadoc names the new package.
Build: git-worktrees is removed from the root pom.xml and its directory and POM are deleted; git-core/pom.xml is adapted. module-layering and consumer-isolation are unchanged.
DomainTermAbsenceTest of git-core asserts a public type per exported package; the duplicate in git-worktrees is deleted (reactor test count 883 to 882).
Specification: doc/specification/git-worktrees.adoc is merged into doc/specification/git-core.adoc (requirements renumbered GDR-WT-1..4 to GDR-CORE-12..15) and doc/specification/general.adoc is adapted.
Decisions and documents: ADR-0004 is rewritten in place, ADR-0001 is adapted, and doc/concepts/module-structure.adoc, doc/resources/diagrams/module-dependency-graph.svg, doc/clients/pm-mcp-core.adoc, doc/README.adoc, README.adoc and AGENTS.md are adapted to the merged module.
Test Plan
Verification command passed (python3 .plan/execute-script.py plan-marshall:build-maven:maven run --command-args "verify")
Linked working-tree operations—including creation, listing, removal, commits, status checks, and branch-reservation release—are now part of the core Git library.
Updated module and feature documentation to reflect the consolidated structure.
…s a package
The git-worktrees module becomes the package de.cuioss.git.document.core.worktrees
of git-core: main code and tests moved by git mv, the requirement ids GDR-WT-1..4
rewritten to GDR-CORE-12..15, the worktrees log records added to GitCoreLogMessages
(INFO 2-4, WARN 102-104) and the git-worktrees module removed from the reactor.
The git-core DomainTermAbsenceTest now also asserts that every exported package
holds a public type.
Co-Authored-By: plan-marshall <noreply@cuioss.de>
…ore.adoc
The specification of the removed module becomes the part "Working Trees" of
git-core.adoc with its requirements renumbered GDR-CORE-12 to GDR-CORE-15, and
general.adoc names the working-tree operations of git-core instead of the module.
Co-Authored-By: plan-marshall <noreply@cuioss.de>
ADR-0004 now names git-core and git-testing as the JGit foundation and
records that the working-tree operations are the package
de.cuioss.git.document.core.worktrees of git-core; its affects list drops
git-worktrees. ADR-0001 says the working-tree operations of git-core stay
available for consumers that need files. Both stay Accepted.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AEE74vgdJL9fmn81BKweSn
… merged module
module-structure.adoc, the module dependency graph, the pm-mcp-core client
document, doc/README.adoc, README.adoc and AGENTS.md describe the working-tree
operations as the package de.cuioss.git.document.core.worktrees of git-core.
The diagram shows six modules, the client section is renamed "What the
Worktrees Package Took and Changed", GDR-WT-1..4 links become GDR-CORE-12..15
and GIT_WORKTREES-101 becomes GIT_CORE-103.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AEE74vgdJL9fmn81BKweSn
The pull request moves linked-working-tree operations from the separate git-worktrees module into the git-core module. It updates the package export, logging, tests, reactor configuration, specifications, and repository documentation to reflect the consolidation.
Changes: Worktree consolidation
Layer / File(s)
Summary
Worktree package and logging in git-core git-core/src/main/java/de/cuioss/git/document/core/worktrees/*, git-core/src/main/java/de/cuioss/git/document/core/GitCoreLogMessages.java, git-core/src/main/java/module-info.java, doc/specification/git-core.adoc, git-core/doc/LogMessages.adoc, git-worktrees/src/main/java/...
The worktree package is declared under git-core and exported by its module descriptor. Worktree log records are added to GitCoreLogMessages, and the git-core specification documents the operations and outcomes.
Worktree test migration git-core/src/test/java/de/cuioss/git/document/core/..., git-worktrees/src/test/java/...
Worktree tests move to the git-core package and update log assertions and requirement identifiers. The git-core domain-term test checks that scanned public types cover exported packages.
Reactor and documentation updates pom.xml, git-worktrees/pom.xml, git-worktrees/src/main/java/module-info.java, AGENTS.md, README.adoc, doc/*
The root reactor and git-worktrees module files are removed. Specifications, architecture documents, client documentation, and repository guidance identify worktree functionality as part of git-core.
This moves worktree operations into git-core with no intended behavior change. The remaining concern is that a handwritten outcome table in the specification may drift from the enum later. It is mergeable, but run the full Maven verify build first.
Pre-merge checks: 2
Check name
Status
Explanation
Description Check
Check skipped - CodeRabbit’s high-level summary is enabled.
Title check
The title "refactor(git-core): merge git-worktrees into git-core as a package" matches the main change. The PR removes the git-worktrees Maven module and moves its code and tests into git-core under d…
Full details: Title check
Explanation
The title "refactor(git-core): merge git-worktrees into git-core as a package" matches the main change. The PR removes the git-worktrees Maven module and moves its code and tests into git-core under de.cuioss.git.document.core.worktrees. The title is specific, uses a conventional commit style, and names the affected module and the nature of the change. It does not mention the requirement ID renumbering or the log-message merge, which are secondary details.
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.
In reply to comment_id: PRR_kwDOVwLcIM8AAAABZWPMbg
Review summary only (1 actionable comment). That comment, on doc/specification/general.adoc, is answered in its own thread; nothing else in this review body asks for a change.
In reply to comment_id: IC_kwDOVwLcIM8AAAABo-VyJA
Walkthrough and merge-risk summary (risk Low, mergeable). Its one remark, the hand-written outcome table, is answered in the inline thread: GitOutcomeSpecificationTest already fails the build on drift. The OSV Scanner warning (exit code 127) is a failure of the scanner run itself, not a finding about the change; this PR touches no dependency.
JGitWorktreeOperations.existingBranchStart reads Ref.getObjectId() into a
local, refuses with NOT_FOUND when it is null and passes that local to
StartPoint.of, so the null flow is visible to Sonar (java:S4449). Ref.getObjectId()
is @nullable in JGit 7.8.0.202609011348-r. Results, outcomes, messages and the
order of the checks are unchanged.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AEE74vgdJL9fmn81BKweSn
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Removes the Maven module
git-worktreesand makes its code the packagede.cuioss.git.document.core.worktreesofgit-core, before the first release. The change is a move: no worktree operation changes its behaviour, outcome or message text.Intent
Problem.
git-worktreesis a second module that adds no third-party dependency and is about 1,700 lines against about 5,000 ingit-core. Every plan has paid for the second module again: an Enforcer block, a domain-term test, a specification, and build and metadata decisions. Module coordinates are cheapest to change before 0.1.0.Approach. Move the code as the package
de.cuioss.git.document.core.worktreesofgit-core(git mv, behaviour unchanged).GitWorktreesLogMessagesmerges intoGitCoreLogMessages(INFO 2-4, WARN 102-104; the worktrees refusal stays a separate record,WORKTREE_CAPABILITY_REFUSED= 102). The worktrees requirements are renumberedGDR-WT-1..4toGDR-CORE-12..15and ADR-0004 is rewritten in place (both owner decisions). The specification, all documents and the dependency-graph SVG follow the merged module. The test count goes from 883 to 882: the only deleted test is the duplicategit-worktreesDomainTermAbsenceTest.Non-goals. No behaviour change in any worktree operation. No dependency added or removed;
consumer-isolationandmodule-layeringare unchanged..github/project.ymlis untouched, so this is not a release.git-storedoes not depend on the worktrees package.Changes
git-worktreesintogit-core(git mv);git-core/src/main/java/module-info.javaexports both packages.GitWorktreesLogMessagesis merged intoGitCoreLogMessages(INFO 2-4, WARN 102-104) andgit-worktrees/doc/LogMessages.adocintogit-core/doc/LogMessages.adoc;GitOutcomeJavadoc names the new package.git-worktreesis removed from the rootpom.xmland its directory and POM are deleted;git-core/pom.xmlis adapted.module-layeringandconsumer-isolationare unchanged.DomainTermAbsenceTestofgit-coreasserts a public type per exported package; the duplicate ingit-worktreesis deleted (reactor test count 883 to 882).doc/specification/git-worktrees.adocis merged intodoc/specification/git-core.adoc(requirements renumberedGDR-WT-1..4toGDR-CORE-12..15) anddoc/specification/general.adocis adapted.doc/concepts/module-structure.adoc,doc/resources/diagrams/module-dependency-graph.svg,doc/clients/pm-mcp-core.adoc,doc/README.adoc,README.adocandAGENTS.mdare adapted to the merged module.Test Plan
python3 .plan/execute-script.py plan-marshall:build-maven:maven run --command-args "verify")Related Issues
None.
🤖 Generated with Claude Code
https://claude.ai/code/session_01AEE74vgdJL9fmn81BKweSn
Summary by CodeRabbit