Only use remote branches for our syncing. #4984
Conversation
We don't care about branches local to us. This causes bugs where a local and remote branch have the same name, and we sync `stable` in and endless loop. Fixes #4980
Codecov Report
@@ Coverage Diff @@
## master #4984 +/- ##
==========================================
- Coverage 76.8% 76.76% -0.05%
==========================================
Files 158 158
Lines 9937 9937
Branches 1241 1241
==========================================
- Hits 7632 7628 -4
- Misses 1973 1974 +1
- Partials 332 335 +3
|
Codecov Report
@@ Coverage Diff @@
## master #4984 +/- ##
=========================================
- Coverage 76.8% 76.8% -0.01%
=========================================
Files 158 158
Lines 9937 9940 +3
Branches 1241 1242 +1
=========================================
+ Hits 7632 7634 +2
Misses 1973 1973
- Partials 332 333 +1
|
|
I've done a somewhat hacky thing here and made it so we use the local branches in testing. I looked at fixing it, but I think we should ship the hacky thing for now to get this working in prod. In the future we can remove it. I will add another ticket for this. |
There was a problem hiding this comment.
This looks fine to me.
Did you already hotfixed this and we are sure that this will work in production? After some local testing I think it will, but I'm still not sure :)
I left a comment in the other issue you just created about how to improve the tests here.
|
I haven't hotfixed it yet, was waiting on review. Will ship it now 👍 |
We don't care about branches local to us.
This causes bugs where a local and remote branch have the same name,
and we sync
stablein and endless loop.Fixes #4980