fix: create/move refs for main #199
Conversation
Corrects the issue where Gilt does not overlay when the target repo has been updated. Fixes: #190
|
@0xDEC0DE this looks to do the correct thing based on your steps. |
| RunCmdInDir("git", []string{"fetch", "--tags", "--force"}, suite.cloneDir). | ||
| RunCmdInDir("git", []string{"fetch", "--tags", "--force", "origin", "+refs/heads/*:refs/heads/*"}, suite.cloneDir). |
There was a problem hiding this comment.
This will work, right up until somebody has a ~/.gitconfig that reconfigures clone.defaultRemoteName to something else. Which might never, ever, happen, but if it does, hilarity will ensue.
How it should work, to be 100% surprise-free, is the Clone method should call git clone --origin $SOME_GILT_VALUE, and git fetch should use the same origin name. (I suggest gilt)
Of course, this has knock-on effects, since an existing cached clone without the "special" name should be invalidated and re-cloned. Which means more code, and more tests.
It's fairly straightforward, but it WILL require a small refactor of the Git workflow, since "yes, it exists" is no longer necessarily a viable cache hit. I'll endeavor to get you something in the next few days.
There was a problem hiding this comment.
A lot of this would become moot if/when #72 is implemented.
There was a problem hiding this comment.
Either moot, or requiring explicit implementation anyhow, depending on how the library manages default values, pays attention to config files, etc.
|
This is superseded by #201 |
Corrects the issue where Gilt does not overlay when the target repo has been updated.
Fixes: #190