Odoo is the world's easiest all-in-one management software.
It includes hundreds of business apps:

CRM
e-Commerce
Financeiro
Inventário
PoS
Projeto
MRP

All apps

Todas as publicações Pessoas Emblemas

Marcadores (Ver tudo)

odoo accounting v14 pos v15

Sobre este fórum

Ajuda

[v8] why does 'git status' return an "up-to-date" while it actually is outdated?

git

1 Responder

6512 Visualizações

gunnar

example

~$: ls -l /opt/odoo/odoo-server/addons | grep account

returns a date Sep 23 11:43 for the module 'accountant'

the folder account in https://github.com/OCA/OCB/tree/8.0/addons says 'a day ago' (which is Sep 26)

is 'git status' not the correct command to show whether there are any updates in your remote origin (do to the manpage I would say it is)? what would it be instead?

I had the same situation before I actually updated from the v8 RC Version to v8 stable with a git pull origin 8.0 and there was something to pull, so the ooutput of git status was misleading.

Ben Bernard

Melhor resposta

git status is a command to show summary / information about your local git repo. git is really a distributed version control system. It means that you control your local git repo for most of the time. git doesn't provide a command to check status of remote repo. To download all new remote commits, if available, you can use git fetch. In fact, git pull, is a shortcut for git fetch, then git merge. The workflow would be something like the following.

git fetch --progress
notice a new commit
I'm in 8.0 branch. I want to merge just the 8.0 branch.
git merge origin/8.0

[1] https://www.kernel.org/pub/software/scm/git/docs/git-fetch.html

[2] https://www.kernel.org/pub/software/scm/git/docs/git-merge.html

gunnar

Autor

I though 'git status' was there to show difference between local repo and it's origin. I wanted to use it to see whether there IS anything to pull. Till now I am updating my local repo with 'git pull origin 8.0' which (as you also say) combines 'git fetch' and 'git merge' in one command. If I understand you correctly 'git status' does not compare my local with it's remote origin but just only returns info about my local repo (like whether I have changes made, i.e.), right?

Ben Bernard

Yes. What I mean local repo is "working tree". Check also https://www.kernel.org/pub/software/scm/git/docs/git-status.html

gunnar

Autor

I think I got the fetch, merge, pull magic now: fetch = download a new commit (without doing anything with it yet) merge = 'applying' the downloaded files (merging them with your local repo) pull = fetch & merge in one step

gunnar

Autor

what is the advantage of doing 2-steps (git fetch, git merge)? A disadvantage might be that you download (fetch) data for all branches (7.0 & 8.0) even if you only need 8.0 (as in my case). I don't even have a clone of 7.0 even but apparently git fetch doesn't mind. So, for now I would be in favor of a git pull origin/8.0 (being said that I am a passive git user. I don't code anything, I only update my local installation from the remote origin)

Está gostando da discussão? Não fique apenas lendo, participe!

Crie uma conta hoje mesmo para aproveitar os recursos exclusivos e interagir com nossa incrível comunidade!

Publicações relacionadas	Respostas	Visualizações
how can I solve this git conflict "local changes of the following file would be overwritten by merge"? Resolvido git	1 mar. 15	36904
how can I check which commit I have pulled to my local odoo v8 repository? git	2 mar. 15	7798
How to install Community App in OpenERP v7.0 git	2 mar. 15	5435
Odoo Git Integration integration git	1 fev. 24	2797
Git with Odoo Community Edition git v15	2 nov. 22	13958

Esta pergunta foi sinalizada

Está gostando da discussão? Não fique apenas lendo, participe!