pe/josh-sync
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Auto-reconcile subrepo history when josh filter changes

Browse Source 
When the exclude list changes, josh-proxy recomputes filtered history
with new SHAs, breaking common ancestry with the subrepo. Instead of
requiring a manual reset (force-push), forward sync now detects the
filter change and creates a reconciliation merge commit that connects
the old and new histories — no force-push, no re-clone needed.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Slim B
2026-02-14 10:40:08 +03:00
parent d7f8618b38
commit 22bd59a9d7
3 changed files with 97 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/guide.md
View File

@@ -573,6 +573,10 @@ Josh uses `::` patterns inside `:exclude[...]`:
No extra files to generate or commit — the exclusion is embedded directly in the josh-proxy URL.
### Changing the exclude list
You can safely add or remove patterns from `exclude` at any time. When josh-sync detects that the filter has changed since the last sync, it automatically creates a reconciliation merge commit on the subrepo that connects the old and new histories — no manual reset or force-push required. Developers do not need to re-clone the subrepo.
## Adding a New Target
To add a new subrepo after initial setup: