Repository navigation
Fast-forward submodules on their branches with --submodules - #10
Merged
Merged
Conversation
- --submodules treats each submodule checked out on a branch as a repository of its own: fetched, fast-forwarded with the same rules and listed under its parent. Detached submodules are skipped. - Honour submodule.recurse again, as git pull does: the switch from git pull to fetch + merge in 0.5.0 had silently dropped it. - A submodule checked out at a different commit than the parent records no longer counts as a local change, so it can't make --dry-run predict dirty or stop --rebase; git itself updates over it.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
--submodules
Each submodule checked out on a branch is treated as a repository of its own: fetched, fast-forwarded with the same rules (dirty, diverged, --rebase, --dry-run all apply) and listed under its parent with its full path:
Submodules on a detached HEAD are skipped; uninitialized ones are left out. Tested on a real workspace of 62 repositories with 14 that have submodules.
Fixes
git pullwith fetch + fast-forward, pullr ignored it; now, as withgit pull, submodules are checked out at the recorded commits after an update.--dry-runcould predict "dirty" and--rebasecould refuse whenever upstream bumped a submodule pointer.6 new tests; 38 pass on bash 5 and 3.2.