Skip to content

Feature/reset #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Conversation

flashdagger
Copy link

This PR adds the 'git subrepo reset' subcommand.

It simply does a forced reclone on an existing subrepo.
The remote and branch are taken from the .gitrepo file if not specified. You can optionally also specify a commit-ish reference.

Some people asked for something like this and I also sometimes need to set the subrepo to a certain state when something is wrong or I just need to switch back.
Since I'm not an bash expert the code might not be perfect and I didn't provide any tests. But the scripts are well structured so I could easily implement it for myself. Would be happy to get some feedback.

@jrosdahl
Copy link
Contributor

Just a note: The described use case is partially related to #388.

@flashdagger
Copy link
Author

Yes. I think we all need something similar.
One thing I like about subrepo is that it keeps the information about the remote and branch so I don't need to specify it on every command like for git subtree. But once something is messed up or you decide to switch branches you need to use subrepo clone and specify everything from scratch...

@admorgan
Copy link
Collaborator

You can now use --force with git pull as the documentation always said you could, but recently was added.

@admorgan admorgan closed this Nov 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants