Conversation
This was all done in the hope to fix the bug reported in #80 Signed-off-by: Jim Fitzpatrick <jimfity@gmail.com>
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.
Closes #80
Summary
When git-grab clones a repository in the default worktree (bare) mode, the resulting repository now configures per-branch upstream tracking so that
git pullandgit pushwork out of the box without manual--set-upstream-toconfiguration.Three new post-clone configuration steps are added to the worktree flow:
core.logallrefupdatesso reflogs are maintained in the bare repository, matching non-bare clone behavior.branch.autoSetupMergetoalwaysso that future branches created from remote refs automatically configure their upstream tracking.branch.<name>.remoteandbranch.<name>.mergeto point atoriginandrefs/heads/<name>respectively. This ensures every branch present at clone time has correct tracking information.Acceptance Criteria
The issue states that after
grab git@github.com:user/repo.git, runninggit pullinside a worktree should work without requiring manualgit branch --set-upstream-tocommands.This is addressed in two ways:
setLocalTracking, which runs afterfetchOriginand configuresbranch.<name>.remoteandbranch.<name>.mergefor every local branch.branch.autoSetupMerge=always, so any new branch created from a remote-tracking ref will automatically inherit the correct upstream configuration.