-
Notifications
You must be signed in to change notification settings - Fork 12
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
✨PMIPA-5055 Stash changes before update branch on repo_setup #970
Conversation
…bug on git clone of repo_setup of SAL
Por favor, catalogue-o seguindo as instruções nesta documentação. [Via VPN]. 💁 Qualquer problema ou dúvida, estamos no Slack, basta abrir um ticket no canal #help-foundation-platform. |
tools/repo_setup.py
Outdated
).decode("utf-8") | ||
if status_output: | ||
self.run_command( | ||
["git", "stash", "push", "--include-untracked"], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sugerância de verbosidade:
["git", "stash", "push", "--include-untracked"], | |
["git", "stash", "push", "-m", '"STASHED BY REPO_SETUP.PY"', "--include-untracked"], |
Só pro caso do pop falhar
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Eu tinha botado com nome mas não achei uma forma de fazer o pop pelo nome e perdi tempo demais nisso... Vou botar então
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Acho que pode deixar o pop como está... Tava pensando só numa informação a mais se o pop falhar por conta de conflito, por ex...
tools/repo_setup.py
Outdated
["git", "stash", "push", "--include-untracked"], | ||
_path, | ||
) | ||
stash_applied = True |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Acho que seria interessante pegar o result do comando aqui... Só pra não achar que stashou se não tinha nada pra stashar...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mas eu vejo se tem algo pra dar stash antes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tendi... É, não sei se existe um cenário que o comando de stash possa falhar, fora não ter nada pra stashar (já verificado)...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Quando des-stasha o que acontece se tiver conflito?
Na hora do stash, podia cuspir um diff em algum lugar, just in case!
Na hora que ele aplica o stash mostra os arquivos q vieram do stash aplicado |
✨ PMIPA-5055 Stash changes before update branch on repo_setup. Fixes bug on git clone of repo_setup of SAL