git son: add command to create independent child repositories#2122
git son: add command to create independent child repositories#2122Evandabest wants to merge 5 commits into
Conversation
Welcome to GitGitGadgetHi @Evandabest, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests. Please make sure that either:
You can CC potential reviewers by adding a footer to the PR description with the following syntax: NOTE: DO NOT copy/paste your CC list from a previous GGG PR's description, Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:
It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code. Contributing the patchesBefore you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form Both the person who commented An alternative is the channel Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment If you want to see what email(s) would be sent for a After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail). If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the curl -g --user "<EMailAddress>:<Password>" \
--url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txtTo iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description): To send a new iteration, just add another PR comment with the contents: Need help?New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join. You may also be able to find help in real time in the developer IRC channel, |
|
There are issues in commit b627ec5:
|
|
There are issues in commit 1b98825:
|
|
There are issues in commit 21680fc:
|
|
There are issues in commit 52c738e:
|
|
There are issues in commit 4bb623d:
|
5decf27 to
26d7fe0
Compare
|
There are issues in commit 0326cf4:
|
|
There are issues in commit 4ba29cb:
|
|
There are issues in commit 46fba44:
|
|
There are issues in commit 26d7fe0:
|
Introduce git-son, a new porcelain command that creates an independent child repository inside the current working tree. Unlike submodules, the child is not tracked by the parent; instead its directory is added to the parent's .gitignore and a "parent" remote is configured in the child pointing back to the parent's origin URL or local path. This gives users a lightweight way to spin off a related repository that knows where it came from without the coupling that submodules impose. The command supports two optional flags: --inherit fetch the parent's history into the child at creation --branch check out a specific parent branch (requires --inherit) Assisted-by: Claude Opus 4.6 Signed-off-by: Evan Haque <evanhaque1@gmail.com>
Add git-son.sh to SCRIPT_SH in the Makefile and to the scripts_sh array in meson.build so that the script is installed alongside the other shell-based Git commands during "make install" and meson builds. Also add /git-son to .gitignore so that the build artifact produced from git-son.sh is not flagged as an untracked file. Assisted-by: Claude Opus 4.6 Signed-off-by: Evan Haque <evanhaque1@gmail.com>
Register git-son in command-list.txt as a mainporcelain command so that it appears in "git help" output and is discoverable through the standard help machinery. Assisted-by: Claude Opus 4.6 Signed-off-by: Evan Haque <evanhaque1@gmail.com>
Add a man page (git-son.adoc) documenting the synopsis, options, and usage examples for the new command. Register the page in Documentation/meson.build so it is built by the meson doc target. Assisted-by: Claude Opus 4.6 Signed-off-by: Evan Haque <evanhaque1@gmail.com>
Add t5151-son.sh with nine test cases covering: - basic child repository creation - parent remote configuration in the child - .gitignore update in the parent - initial commit presence in the child - failure when the target directory already exists - --branch without --inherit is rejected cleanly - no leftover directory on validation failure - --inherit fetches parent history Register the test in t/meson.build so the meson build system discovers and runs it. Assisted-by: Claude Opus 4.6 Signed-off-by: Evan Haque <evanhaque1@gmail.com>
Motivation
When spinning off a new project that is related to an existing repository, there is no built-in way to create a child repository that maintains a link back to its parent without the tight coupling of submodules. Submodules pin the child to a specific commit and require the parent to track the child in its index, which is too heavyweight when the child is meant to be fully independent.
The typical workflow today is manual:
git init,git remote add, update.gitignore— three steps that are easy to forget or get wrong.git sonautomates this and establishes a lightweight convention for the parent-child relationship: a remote namedparentin the child, and nothing in the parent except an ignore rule.Summary
This series introduces
git son, a new porcelain command that creates an independent child repository inside the current working tree. Unlike a submodule, the child is not tracked by the parent; instead, its subdirectory is added to the parent's.gitignore. The child is configured at creation time with a remote namedparentpointing back to the parent repository's origin URL (or local path if no origin exists), making the lineage explicit and recoverable via standard Git commands.Changes
git-son.sh: new shell script implementing the command, supporting--inheritto fetch parent history at creation time and--branch <branch>(requires--inherit) to check out a specific parent branchgit-sonregistered incommand-list.txtasmainporcelaingit-son.shadded toSCRIPT_SHinMakefileand toscripts_shinmeson.buildDocumentation/git-son.adoc: new man page covering synopsis, option descriptions, and worked examplesDocumentation/meson.build:git-son.adocadded to the manpage build listt/t5151-son.sh: new test script covering basic creation,parentremote configuration,.gitignoreupdate, idempotency failure, flag validation, and--inheritwith a bare remoteDetails
The key design property is independence: the child is a fully self-contained repository with no entry in the parent's index. The
parentremote is the only artifact linking the two, which meansgit fetch parentandgit log parent/<branch>work as expected from within the child without any special tooling.The
--branchflag is intentionally restricted to--inheritmode. Without fetching, there is no remote-tracking branch to check out from, so accepting--branchalone would be misleading; the command dies with a clear diagnostic in that case.When no origin URL is available in the parent, the
parentremote is set to the parent's absolute local path. This covers the common case of repositories that have never been pushed to a remote.Testing
t/t5151-son.shcovers the following scenarios:.gitpresent)parentremote is correctly recorded in the child.gitignore--inheritis not used--branchwithout--inheritis rejected before any filesystem changes--inheritfetches parent history and the remote-tracking branch is reachable in the child