-
Notifications
You must be signed in to change notification settings - Fork 3.2k
[No QA] Remove --depth=1 to fix rebase #61120
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
Conversation
@akinwale no C+ review needed here |
Reviewer Checklist
Screenshots/VideosAndroid: NativeAndroid: mWeb ChromeiOS: NativeiOS: mWeb SafariMacOS: Chrome / SafariMacOS: Desktop |
@AndrewGable looks like this was merged without a test passing. Please add a note explaining why this was done and remove the |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
No emergency, just a failed remote build |
🚀 Deployed to staging by https://github.com/AndrewGable in version: 9.1.39-0 🚀
|
🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.1.39-8 🚀
|
Explanation of Change
Rebase isn't working because we aren't fetching everything that was added on the remote. Lacking the proper history, git can't resolve conflicts during the rebase (because commits being replayed do not have a common merge-base).
Fixed Issues
$ #59856
Tests
I was able to reproduce the bug easily in the test fork, and here is a workflow run showing the fix.
I was pleasantly surprised to see that the fetch was still fast. The repo was shallow-checked out, so by default
fetch
will get all the new commits, and to get older commits you'd need to pass flags like--deepen
or--depth=X
or--shallow-since
or--shallow-exclude
.Offline tests
None.
QA Steps
None.
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)src/languages/*
files and using the translation methodSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Design
label and/or tagged@Expensify/design
so the design team can review the changes.ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop