Run 'git fetch' with '--force' if no revision given #237
Conversation
This file contains 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
snim2
force-pushed
the
fix/would-clobber-existing-tag-on-fetch
branch
from
bea0d2f to
01a63f8
Compare
snim2
force-pushed
the
fix/would-clobber-existing-tag-on-fetch
branch
from
01a63f8 to
5ba0a83
Compare
When we run 'git fetch' without a specific revision we usually run it with '--all' which fetches tags (among other things). We now have movable tags in our plugin repositories and when a tag is moved a 'git fetch' or 'checkout' will produce a 'would clobber existing tag' error on the command line, which warns the user that the tag that has already been checked into the local clone will be overwritten. This commit fixes that error by running 'fetch' with '--force' if we do not specify a revision.
snim2
force-pushed
the
fix/would-clobber-existing-tag-on-fetch
branch
from
5ba0a83 to
b1a4613
Compare
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.
When we run
git fetchwithout a specific revision we usually run it with--allwhich fetches tags (among other things).We now have movable tags in our plugin repositories and when a tag is moved a
git fetchorcheckoutwill produce a 'would clobber existing tag' error on the command line, which warns the user that the tag that has already been checked into the local clone will be overwritten.This commit fixes that error by running
fetchwith--forceif we do not specify a revision.Testing
This can only be tested if you have a repo checked out with a major revision tag of a plugin which has been moved, in which case you will see
would clobber existing tagwhen you runwhippet deps update. At this point, you can try the same thing with this branch and see if that fixes the issue.Merge checklist