feat: add --branch option to clone or checkout different dotfiles branch #8331
Conversation
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
mafredri
reviewed
Jul 6, 2023
mafredri
approved these changes
Jul 6, 2023
| if err != nil { | ||
| // Do not block on this error, just log it and continue | ||
| _, _ = fmt.Fprintln(inv.Stdout, | ||
| cliui.DefaultStyles.Error.Render(fmt.Sprintf("Failed to use branch %q (%s), continuing...", err.Error(), gitbranch))) |
There was a problem hiding this comment.
Would it make sense to use a non-zero exit code if this happens? Otherwise the user might expect one thing but receive another due to the silent failure. (Not saying we can't continue from here, but set a branchFailed = true and then exit 1 at the end.
There was a problem hiding this comment.
That is an idea. I am not sure, I was copying the existing behavior.
See this:
Line 142 in e1d7dc3
If the git pull --ff-only fails then we continue, even though we are now operating in a stale dotfiles. I was maintaining that behavior of continuing.
If we decide to exit code 1, we should go back and also change the previous behavior.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
If
--branchis specified, theclonewill clone that branch.The code will always do a
git branch --show-currentand checkout the specified branch if the flag is provided.Fixes: #8282
How it works
--branchis specified, git clone usesgit clone --branch <xxx> ...git pull(git checkoutmight fail before a pull.--branchexistsgit checkout <branch>git pull --ff-only(The earlier pull was on the wrong branch)