harness-everything 0.25.0 → 0.25.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.claude-plugin/marketplace.json +1 -1
- package/.claude-plugin/plugin.json +1 -1
- package/CHANGELOG.md +13 -0
- package/opencode-plugin/plugin.json +1 -1
- package/package.json +1 -1
- package/plugins/harness-everything/.codex-plugin/plugin.json +1 -1
- package/plugins/harness-everything/plugin.json +1 -1
- package/plugins/harness-everything/skills/using-git-worktrees/SKILL.md +14 -13
- package/plugins/harness-everything/skills/using-git-worktrees/references/submodules-in-worktrees.md +135 -0
- package/sbom.cdx.json +7 -7
- package/using-git-worktrees/SKILL.md +14 -13
- package/using-git-worktrees/references/submodules-in-worktrees.md +135 -0
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"name": "harness-everything",
|
|
11
11
|
"source": "./",
|
|
12
12
|
"description": "Harness OS: an orchestrated agent operating system — tier routing, circuit breaker guardrails, verification gates, WAL session memory, and self-evolving workspace rules.",
|
|
13
|
-
"version": "0.25.
|
|
13
|
+
"version": "0.25.1",
|
|
14
14
|
"author": {
|
|
15
15
|
"name": "Miya Daniel"
|
|
16
16
|
},
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "harness-everything",
|
|
3
3
|
"description": "Harness OS: an orchestrated agent operating system — tier routing, circuit breaker guardrails, verification gates, WAL session memory, and self-evolving workspace rules.",
|
|
4
|
-
"version": "0.25.
|
|
4
|
+
"version": "0.25.1",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Miya Daniel"
|
|
7
7
|
},
|
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,19 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project are documented in this file.
|
|
4
4
|
|
|
5
|
+
## [0.25.1](https://github.com/dyphn1/Harness-everything/compare/v0.25.0...v0.25.1) (2026-09-24)
|
|
6
|
+
|
|
7
|
+
### Bug Fixes
|
|
8
|
+
|
|
9
|
+
* **skills:** document worktree submodule reachability ([024185a](https://github.com/dyphn1/Harness-everything/commit/024185ab29363968bbe30d648cf2ef902751e9b9))
|
|
10
|
+
* **skills:** keep worktree contract within token budget ([c41903d](https://github.com/dyphn1/Harness-everything/commit/c41903d2c37e3af127b84b0ba9c5a82cd4fab3ee))
|
|
11
|
+
* **skills:** preserve isolation contract wording ([b14ea2a](https://github.com/dyphn1/Harness-everything/commit/b14ea2a6e6417f4103f16e5d2cf04e6fc994e583))
|
|
12
|
+
* **skills:** require submodule reachability reference ([5c61c2b](https://github.com/dyphn1/Harness-everything/commit/5c61c2bbae0f2e29818579bd2ebcd7d45a76c1b0))
|
|
13
|
+
* **skills:** sync compact worktree contract ([cd4e3a8](https://github.com/dyphn1/Harness-everything/commit/cd4e3a8db276083ac11346031f626058cd02bed3))
|
|
14
|
+
* **skills:** sync isolation contract wording ([7f59b1c](https://github.com/dyphn1/Harness-everything/commit/7f59b1c4e66d00ec84c225ad161e503a443ad1cd))
|
|
15
|
+
* **skills:** sync worktree submodule reference ([b3fdf5d](https://github.com/dyphn1/Harness-everything/commit/b3fdf5dff8b2c22ff02cc39510d23dc60c2489ae))
|
|
16
|
+
* **skills:** sync worktree submodule skill ([08dffec](https://github.com/dyphn1/Harness-everything/commit/08dffec0aa69602b61a1a90b6d10cbf97cea0dcb))
|
|
17
|
+
|
|
5
18
|
## [0.25.0](https://github.com/dyphn1/Harness-everything/compare/v0.24.0...v0.25.0) (2026-09-23)
|
|
6
19
|
|
|
7
20
|
### Features
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json",
|
|
3
3
|
"name": "harness-everything",
|
|
4
|
-
"version": "0.25.
|
|
4
|
+
"version": "0.25.1",
|
|
5
5
|
"description": "Invariant-first engineering harness for routing, verification, and failure recovery while preserving agent autonomy.",
|
|
6
6
|
"author": {
|
|
7
7
|
"name": "Miya Daniel",
|
|
@@ -4,44 +4,45 @@ description: Use when work needs isolation or before major implementation plans
|
|
|
4
4
|
license: Apache-2.0
|
|
5
5
|
metadata:
|
|
6
6
|
author: Miya Daniel
|
|
7
|
-
version: 0.
|
|
7
|
+
version: 0.25.1
|
|
8
8
|
---
|
|
9
9
|
|
|
10
10
|
# Using Git Worktrees
|
|
11
11
|
|
|
12
|
-
Use native worktree support first; raw Git is
|
|
12
|
+
Use native worktree support first; raw Git is fallback.
|
|
13
13
|
|
|
14
14
|
## Contract
|
|
15
15
|
|
|
16
|
-
- **Tier 3 / Fable (MUST resolve)** — before broad
|
|
17
|
-
- **Ordinary mode
|
|
18
|
-
- **MUST NOT** nest a worktree inside an
|
|
16
|
+
- **Tier 3 / Fable (MUST resolve)** — isolate before broad mutation. If unavailable or explicitly declined, MUST report an explicit degraded fallback/risk.
|
|
17
|
+
- **Ordinary mode SHOULD** isolate when it materially reduces collision/risk.
|
|
18
|
+
- **MUST NOT** nest a worktree inside an isolated worktree.
|
|
19
19
|
|
|
20
20
|
## Workflow
|
|
21
21
|
|
|
22
|
-
**Step 0 — Detect
|
|
22
|
+
**Step 0 — Detect**:
|
|
23
23
|
```bash
|
|
24
24
|
git rev-parse --git-dir
|
|
25
25
|
git rev-parse --git-common-dir
|
|
26
26
|
git branch --show-current
|
|
27
27
|
git rev-parse --show-superproject-working-tree
|
|
28
|
+
git submodule status --recursive
|
|
28
29
|
```
|
|
29
|
-
Different git/common dirs and no superproject => already isolated
|
|
30
|
+
Different git/common dirs and no superproject => already isolated. If submodules exist, **MUST** read `<this-skill-dir>/references/submodules-in-worktrees.md` before committing inside them.
|
|
30
31
|
|
|
31
|
-
**Step 1 — Create/enter**: use native `EnterWorktree`, `/worktree`, or `--worktree
|
|
32
|
+
**Step 1 — Create/enter**: use native `EnterWorktree`, `/worktree`, or `--worktree`; otherwise `git worktree add "$path" -b "$BRANCH_NAME"`. On failure, MUST surface the degraded disposition.
|
|
32
33
|
|
|
33
|
-
**Step 2 — Setup**: install
|
|
34
|
+
**Step 2 — Setup**: install dependencies as needed.
|
|
34
35
|
|
|
35
|
-
**Step 3 — Baseline**: run relevant tests/build
|
|
36
|
+
**Step 3 — Baseline**: run relevant tests/build when useful; surface existing failures.
|
|
36
37
|
|
|
37
38
|
Deep dive: <this-skill-dir>/references/workflow-details.md
|
|
38
39
|
|
|
39
40
|
## USE FOR:
|
|
40
|
-
- Tier 3 / Fable
|
|
41
|
+
- Tier 3 / Fable mutable engineering
|
|
41
42
|
- feature work needing isolation
|
|
42
43
|
- pre-implementation-plan setup
|
|
43
44
|
|
|
44
45
|
## DO NOT USE FOR:
|
|
45
46
|
- nesting inside an existing worktree
|
|
46
|
-
- read-only analysis
|
|
47
|
-
- branch/merge workflows
|
|
47
|
+
- read-only analysis
|
|
48
|
+
- unrelated branch/merge workflows
|
package/plugins/harness-everything/skills/using-git-worktrees/references/submodules-in-worktrees.md
ADDED
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
# Submodules inside linked worktrees
|
|
2
|
+
|
|
3
|
+
A linked worktree of a superproject does **not** share the primary checkout's submodule object store. After `git submodule update --init`, each submodule normally uses a worktree-specific git dir such as:
|
|
4
|
+
|
|
5
|
+
```text
|
|
6
|
+
<super>/.git/worktrees/<worktree-id>/modules/<submodule>
|
|
7
|
+
```
|
|
8
|
+
|
|
9
|
+
The primary checkout uses:
|
|
10
|
+
|
|
11
|
+
```text
|
|
12
|
+
<super>/.git/modules/<submodule>
|
|
13
|
+
```
|
|
14
|
+
|
|
15
|
+
A superproject gitlink records only a commit SHA. It does not publish or copy that commit into the primary checkout. Therefore a submodule commit made only on detached HEAD in a linked worktree can become unreachable when that worktree is removed.
|
|
16
|
+
|
|
17
|
+
## Required rules
|
|
18
|
+
|
|
19
|
+
1. **MUST use a named branch before committing in the submodule.** `git submodule update` normally leaves the submodule detached.
|
|
20
|
+
2. **MUST make the new submodule commit reachable outside the linked worktree before treating the superproject gitlink bump as deliverable.** Publish it to the submodule remote, or fetch it into the primary checkout's submodule repository.
|
|
21
|
+
3. **MUST verify external reachability before removing the linked worktree.** A branch that exists only inside the linked worktree is not sufficient publication evidence.
|
|
22
|
+
|
|
23
|
+
## Detect the situation
|
|
24
|
+
|
|
25
|
+
From the superproject worktree:
|
|
26
|
+
|
|
27
|
+
```bash
|
|
28
|
+
git rev-parse --git-dir
|
|
29
|
+
git rev-parse --git-common-dir
|
|
30
|
+
git submodule status --recursive
|
|
31
|
+
git -C <submodule> rev-parse --absolute-git-dir
|
|
32
|
+
git -C <submodule> branch --show-current
|
|
33
|
+
```
|
|
34
|
+
|
|
35
|
+
A linked superproject has different git/common dirs. A blank submodule branch means detached HEAD.
|
|
36
|
+
|
|
37
|
+
PowerShell uses the same Git commands; quote paths containing spaces:
|
|
38
|
+
|
|
39
|
+
```powershell
|
|
40
|
+
git -C "<submodule>" rev-parse --absolute-git-dir
|
|
41
|
+
git -C "<submodule>" branch --show-current
|
|
42
|
+
```
|
|
43
|
+
|
|
44
|
+
## Prevent the problem
|
|
45
|
+
|
|
46
|
+
Before editing or committing in the submodule:
|
|
47
|
+
|
|
48
|
+
```bash
|
|
49
|
+
git -C <submodule> switch -c <task-branch>
|
|
50
|
+
# edit + verify
|
|
51
|
+
git -C <submodule> add <paths>
|
|
52
|
+
git -C <submodule> commit -m "<message>"
|
|
53
|
+
SUB_SHA=$(git -C <submodule> rev-parse HEAD)
|
|
54
|
+
```
|
|
55
|
+
|
|
56
|
+
PowerShell:
|
|
57
|
+
|
|
58
|
+
```powershell
|
|
59
|
+
git -C "<submodule>" switch -c "<task-branch>"
|
|
60
|
+
# edit + verify
|
|
61
|
+
git -C "<submodule>" add <paths>
|
|
62
|
+
git -C "<submodule>" commit -m "<message>"
|
|
63
|
+
$SubSha = git -C "<submodule>" rev-parse HEAD
|
|
64
|
+
```
|
|
65
|
+
|
|
66
|
+
## Publish before the gitlink is considered deliverable
|
|
67
|
+
|
|
68
|
+
Preferred path when the submodule has a remote:
|
|
69
|
+
|
|
70
|
+
```bash
|
|
71
|
+
git -C <submodule> push -u origin <task-branch>
|
|
72
|
+
git -C <submodule> branch -r --contains "$SUB_SHA"
|
|
73
|
+
```
|
|
74
|
+
|
|
75
|
+
```powershell
|
|
76
|
+
git -C "<submodule>" push -u origin "<task-branch>"
|
|
77
|
+
git -C "<submodule>" branch -r --contains $SubSha
|
|
78
|
+
```
|
|
79
|
+
|
|
80
|
+
If pushing is not appropriate, copy the commit into the primary checkout's submodule repository. From the linked worktree first give a detached commit a name if necessary:
|
|
81
|
+
|
|
82
|
+
```bash
|
|
83
|
+
git -C <worktree>/<submodule> branch -f <task-branch> <sha>
|
|
84
|
+
git -C <primary>/<submodule> fetch <worktree>/<submodule> <task-branch>:<task-branch>
|
|
85
|
+
git -C <primary>/<submodule> cat-file -e <sha>^{commit}
|
|
86
|
+
```
|
|
87
|
+
|
|
88
|
+
```powershell
|
|
89
|
+
git -C "<worktree>/<submodule>" branch -f "<task-branch>" "<sha>"
|
|
90
|
+
git -C "<primary>/<submodule>" fetch "<worktree>/<submodule>" "<task-branch>:<task-branch>"
|
|
91
|
+
git -C "<primary>/<submodule>" cat-file -e "<sha>^{commit}"
|
|
92
|
+
```
|
|
93
|
+
|
|
94
|
+
After the commit is externally reachable, stage the gitlink in the superproject:
|
|
95
|
+
|
|
96
|
+
```bash
|
|
97
|
+
git add <submodule>
|
|
98
|
+
git diff --cached --submodule=log
|
|
99
|
+
```
|
|
100
|
+
|
|
101
|
+
## Recovery after an unpublished gitlink was already committed
|
|
102
|
+
|
|
103
|
+
Do **not** remove the linked worktree. Recover the referenced SHA while its submodule object store still exists:
|
|
104
|
+
|
|
105
|
+
```bash
|
|
106
|
+
git -C <worktree>/<submodule> branch -f <task-branch> <sha>
|
|
107
|
+
git -C <primary>/<submodule> fetch <worktree>/<submodule> <task-branch>:<task-branch>
|
|
108
|
+
git -C <primary>/<submodule> cat-file -e <sha>^{commit}
|
|
109
|
+
git -C <primary> submodule update
|
|
110
|
+
```
|
|
111
|
+
|
|
112
|
+
The PowerShell form is identical except paths/refs should be quoted as shown above.
|
|
113
|
+
|
|
114
|
+
## Pre-removal check
|
|
115
|
+
|
|
116
|
+
For every changed gitlink SHA, prove at least one external home exists:
|
|
117
|
+
|
|
118
|
+
```bash
|
|
119
|
+
git -C <submodule> branch -r --contains <sha>
|
|
120
|
+
# OR, from the primary checkout:
|
|
121
|
+
git -C <primary>/<submodule> cat-file -e <sha>^{commit}
|
|
122
|
+
```
|
|
123
|
+
|
|
124
|
+
If neither succeeds, **MUST NOT** remove the linked worktree yet.
|
|
125
|
+
|
|
126
|
+
## Handoff checklist
|
|
127
|
+
|
|
128
|
+
For each changed submodule record:
|
|
129
|
+
|
|
130
|
+
- submodule path
|
|
131
|
+
- commit SHA
|
|
132
|
+
- branch name
|
|
133
|
+
- publication location: remote-tracking ref or primary checkout object store
|
|
134
|
+
- superproject gitlink staged/committed state
|
|
135
|
+
- reachability check result before worktree removal
|
package/sbom.cdx.json
CHANGED
|
@@ -2,23 +2,23 @@
|
|
|
2
2
|
"$schema": "https://cyclonedx.org/schema/bom-1.7.schema.json",
|
|
3
3
|
"bomFormat": "CycloneDX",
|
|
4
4
|
"specVersion": "1.7",
|
|
5
|
-
"serialNumber": "urn:uuid:
|
|
5
|
+
"serialNumber": "urn:uuid:fb030470-2601-5f76-9c8c-9e7efeb21a03",
|
|
6
6
|
"version": 1,
|
|
7
7
|
"metadata": {
|
|
8
|
-
"timestamp": "2026-09-
|
|
8
|
+
"timestamp": "2026-09-24T12:40:30.113Z",
|
|
9
9
|
"tools": [
|
|
10
10
|
{
|
|
11
11
|
"vendor": "Harness Everything",
|
|
12
12
|
"name": "generate-sbom.js",
|
|
13
|
-
"version": "0.25.
|
|
13
|
+
"version": "0.25.1"
|
|
14
14
|
}
|
|
15
15
|
],
|
|
16
16
|
"component": {
|
|
17
17
|
"type": "application",
|
|
18
|
-
"bom-ref": "pkg:npm/harness-everything@0.25.
|
|
18
|
+
"bom-ref": "pkg:npm/harness-everything@0.25.1",
|
|
19
19
|
"name": "harness-everything",
|
|
20
|
-
"version": "0.25.
|
|
21
|
-
"purl": "pkg:npm/harness-everything@0.25.
|
|
20
|
+
"version": "0.25.1",
|
|
21
|
+
"purl": "pkg:npm/harness-everything@0.25.1"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
@@ -1999,7 +1999,7 @@
|
|
|
1999
1999
|
]
|
|
2000
2000
|
},
|
|
2001
2001
|
{
|
|
2002
|
-
"ref": "pkg:npm/harness-everything@0.25.
|
|
2002
|
+
"ref": "pkg:npm/harness-everything@0.25.1",
|
|
2003
2003
|
"dependsOn": [
|
|
2004
2004
|
"pkg:npm/%40commitlint/cli@19.8.1",
|
|
2005
2005
|
"pkg:npm/%40commitlint/config-conventional@19.8.1",
|
|
@@ -4,44 +4,45 @@ description: Use when work needs isolation or before major implementation plans
|
|
|
4
4
|
license: Apache-2.0
|
|
5
5
|
metadata:
|
|
6
6
|
author: Miya Daniel
|
|
7
|
-
version: 0.
|
|
7
|
+
version: 0.25.1
|
|
8
8
|
---
|
|
9
9
|
|
|
10
10
|
# Using Git Worktrees
|
|
11
11
|
|
|
12
|
-
Use native worktree support first; raw Git is
|
|
12
|
+
Use native worktree support first; raw Git is fallback.
|
|
13
13
|
|
|
14
14
|
## Contract
|
|
15
15
|
|
|
16
|
-
- **Tier 3 / Fable (MUST resolve)** — before broad
|
|
17
|
-
- **Ordinary mode
|
|
18
|
-
- **MUST NOT** nest a worktree inside an
|
|
16
|
+
- **Tier 3 / Fable (MUST resolve)** — isolate before broad mutation. If unavailable or explicitly declined, MUST report an explicit degraded fallback/risk.
|
|
17
|
+
- **Ordinary mode SHOULD** isolate when it materially reduces collision/risk.
|
|
18
|
+
- **MUST NOT** nest a worktree inside an isolated worktree.
|
|
19
19
|
|
|
20
20
|
## Workflow
|
|
21
21
|
|
|
22
|
-
**Step 0 — Detect
|
|
22
|
+
**Step 0 — Detect**:
|
|
23
23
|
```bash
|
|
24
24
|
git rev-parse --git-dir
|
|
25
25
|
git rev-parse --git-common-dir
|
|
26
26
|
git branch --show-current
|
|
27
27
|
git rev-parse --show-superproject-working-tree
|
|
28
|
+
git submodule status --recursive
|
|
28
29
|
```
|
|
29
|
-
Different git/common dirs and no superproject => already isolated
|
|
30
|
+
Different git/common dirs and no superproject => already isolated. If submodules exist, **MUST** read `<this-skill-dir>/references/submodules-in-worktrees.md` before committing inside them.
|
|
30
31
|
|
|
31
|
-
**Step 1 — Create/enter**: use native `EnterWorktree`, `/worktree`, or `--worktree
|
|
32
|
+
**Step 1 — Create/enter**: use native `EnterWorktree`, `/worktree`, or `--worktree`; otherwise `git worktree add "$path" -b "$BRANCH_NAME"`. On failure, MUST surface the degraded disposition.
|
|
32
33
|
|
|
33
|
-
**Step 2 — Setup**: install
|
|
34
|
+
**Step 2 — Setup**: install dependencies as needed.
|
|
34
35
|
|
|
35
|
-
**Step 3 — Baseline**: run relevant tests/build
|
|
36
|
+
**Step 3 — Baseline**: run relevant tests/build when useful; surface existing failures.
|
|
36
37
|
|
|
37
38
|
Deep dive: <this-skill-dir>/references/workflow-details.md
|
|
38
39
|
|
|
39
40
|
## USE FOR:
|
|
40
|
-
- Tier 3 / Fable
|
|
41
|
+
- Tier 3 / Fable mutable engineering
|
|
41
42
|
- feature work needing isolation
|
|
42
43
|
- pre-implementation-plan setup
|
|
43
44
|
|
|
44
45
|
## DO NOT USE FOR:
|
|
45
46
|
- nesting inside an existing worktree
|
|
46
|
-
- read-only analysis
|
|
47
|
-
- branch/merge workflows
|
|
47
|
+
- read-only analysis
|
|
48
|
+
- unrelated branch/merge workflows
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
# Submodules inside linked worktrees
|
|
2
|
+
|
|
3
|
+
A linked worktree of a superproject does **not** share the primary checkout's submodule object store. After `git submodule update --init`, each submodule normally uses a worktree-specific git dir such as:
|
|
4
|
+
|
|
5
|
+
```text
|
|
6
|
+
<super>/.git/worktrees/<worktree-id>/modules/<submodule>
|
|
7
|
+
```
|
|
8
|
+
|
|
9
|
+
The primary checkout uses:
|
|
10
|
+
|
|
11
|
+
```text
|
|
12
|
+
<super>/.git/modules/<submodule>
|
|
13
|
+
```
|
|
14
|
+
|
|
15
|
+
A superproject gitlink records only a commit SHA. It does not publish or copy that commit into the primary checkout. Therefore a submodule commit made only on detached HEAD in a linked worktree can become unreachable when that worktree is removed.
|
|
16
|
+
|
|
17
|
+
## Required rules
|
|
18
|
+
|
|
19
|
+
1. **MUST use a named branch before committing in the submodule.** `git submodule update` normally leaves the submodule detached.
|
|
20
|
+
2. **MUST make the new submodule commit reachable outside the linked worktree before treating the superproject gitlink bump as deliverable.** Publish it to the submodule remote, or fetch it into the primary checkout's submodule repository.
|
|
21
|
+
3. **MUST verify external reachability before removing the linked worktree.** A branch that exists only inside the linked worktree is not sufficient publication evidence.
|
|
22
|
+
|
|
23
|
+
## Detect the situation
|
|
24
|
+
|
|
25
|
+
From the superproject worktree:
|
|
26
|
+
|
|
27
|
+
```bash
|
|
28
|
+
git rev-parse --git-dir
|
|
29
|
+
git rev-parse --git-common-dir
|
|
30
|
+
git submodule status --recursive
|
|
31
|
+
git -C <submodule> rev-parse --absolute-git-dir
|
|
32
|
+
git -C <submodule> branch --show-current
|
|
33
|
+
```
|
|
34
|
+
|
|
35
|
+
A linked superproject has different git/common dirs. A blank submodule branch means detached HEAD.
|
|
36
|
+
|
|
37
|
+
PowerShell uses the same Git commands; quote paths containing spaces:
|
|
38
|
+
|
|
39
|
+
```powershell
|
|
40
|
+
git -C "<submodule>" rev-parse --absolute-git-dir
|
|
41
|
+
git -C "<submodule>" branch --show-current
|
|
42
|
+
```
|
|
43
|
+
|
|
44
|
+
## Prevent the problem
|
|
45
|
+
|
|
46
|
+
Before editing or committing in the submodule:
|
|
47
|
+
|
|
48
|
+
```bash
|
|
49
|
+
git -C <submodule> switch -c <task-branch>
|
|
50
|
+
# edit + verify
|
|
51
|
+
git -C <submodule> add <paths>
|
|
52
|
+
git -C <submodule> commit -m "<message>"
|
|
53
|
+
SUB_SHA=$(git -C <submodule> rev-parse HEAD)
|
|
54
|
+
```
|
|
55
|
+
|
|
56
|
+
PowerShell:
|
|
57
|
+
|
|
58
|
+
```powershell
|
|
59
|
+
git -C "<submodule>" switch -c "<task-branch>"
|
|
60
|
+
# edit + verify
|
|
61
|
+
git -C "<submodule>" add <paths>
|
|
62
|
+
git -C "<submodule>" commit -m "<message>"
|
|
63
|
+
$SubSha = git -C "<submodule>" rev-parse HEAD
|
|
64
|
+
```
|
|
65
|
+
|
|
66
|
+
## Publish before the gitlink is considered deliverable
|
|
67
|
+
|
|
68
|
+
Preferred path when the submodule has a remote:
|
|
69
|
+
|
|
70
|
+
```bash
|
|
71
|
+
git -C <submodule> push -u origin <task-branch>
|
|
72
|
+
git -C <submodule> branch -r --contains "$SUB_SHA"
|
|
73
|
+
```
|
|
74
|
+
|
|
75
|
+
```powershell
|
|
76
|
+
git -C "<submodule>" push -u origin "<task-branch>"
|
|
77
|
+
git -C "<submodule>" branch -r --contains $SubSha
|
|
78
|
+
```
|
|
79
|
+
|
|
80
|
+
If pushing is not appropriate, copy the commit into the primary checkout's submodule repository. From the linked worktree first give a detached commit a name if necessary:
|
|
81
|
+
|
|
82
|
+
```bash
|
|
83
|
+
git -C <worktree>/<submodule> branch -f <task-branch> <sha>
|
|
84
|
+
git -C <primary>/<submodule> fetch <worktree>/<submodule> <task-branch>:<task-branch>
|
|
85
|
+
git -C <primary>/<submodule> cat-file -e <sha>^{commit}
|
|
86
|
+
```
|
|
87
|
+
|
|
88
|
+
```powershell
|
|
89
|
+
git -C "<worktree>/<submodule>" branch -f "<task-branch>" "<sha>"
|
|
90
|
+
git -C "<primary>/<submodule>" fetch "<worktree>/<submodule>" "<task-branch>:<task-branch>"
|
|
91
|
+
git -C "<primary>/<submodule>" cat-file -e "<sha>^{commit}"
|
|
92
|
+
```
|
|
93
|
+
|
|
94
|
+
After the commit is externally reachable, stage the gitlink in the superproject:
|
|
95
|
+
|
|
96
|
+
```bash
|
|
97
|
+
git add <submodule>
|
|
98
|
+
git diff --cached --submodule=log
|
|
99
|
+
```
|
|
100
|
+
|
|
101
|
+
## Recovery after an unpublished gitlink was already committed
|
|
102
|
+
|
|
103
|
+
Do **not** remove the linked worktree. Recover the referenced SHA while its submodule object store still exists:
|
|
104
|
+
|
|
105
|
+
```bash
|
|
106
|
+
git -C <worktree>/<submodule> branch -f <task-branch> <sha>
|
|
107
|
+
git -C <primary>/<submodule> fetch <worktree>/<submodule> <task-branch>:<task-branch>
|
|
108
|
+
git -C <primary>/<submodule> cat-file -e <sha>^{commit}
|
|
109
|
+
git -C <primary> submodule update
|
|
110
|
+
```
|
|
111
|
+
|
|
112
|
+
The PowerShell form is identical except paths/refs should be quoted as shown above.
|
|
113
|
+
|
|
114
|
+
## Pre-removal check
|
|
115
|
+
|
|
116
|
+
For every changed gitlink SHA, prove at least one external home exists:
|
|
117
|
+
|
|
118
|
+
```bash
|
|
119
|
+
git -C <submodule> branch -r --contains <sha>
|
|
120
|
+
# OR, from the primary checkout:
|
|
121
|
+
git -C <primary>/<submodule> cat-file -e <sha>^{commit}
|
|
122
|
+
```
|
|
123
|
+
|
|
124
|
+
If neither succeeds, **MUST NOT** remove the linked worktree yet.
|
|
125
|
+
|
|
126
|
+
## Handoff checklist
|
|
127
|
+
|
|
128
|
+
For each changed submodule record:
|
|
129
|
+
|
|
130
|
+
- submodule path
|
|
131
|
+
- commit SHA
|
|
132
|
+
- branch name
|
|
133
|
+
- publication location: remote-tracking ref or primary checkout object store
|
|
134
|
+
- superproject gitlink staged/committed state
|
|
135
|
+
- reachability check result before worktree removal
|