git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Local branch ahead of tracked remote branch but git push claims everything up-to-date

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 20, 2008, 22:46 UTC
Message-ID
<7v4p5fnw3i.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<alpine.LNX.1.00.0808201808400.19665@iabervon.org>
Daniel Barkalow <barkalow@iabervon.org> writes:
> That is actually to say that fetch should do it (pull calls fetch for that 
> part), and I agree with that, assuming you've actually got that fetch 
> config, of course.

Hmm, traditionally, an explicit refspec on the command line that does not store overrides the configured ones that do store, and I've been using it as a feature when I run test fetches. If I do not like fetched result, I can tell the other guy to fix his history and I do not have to contaminate the history my tracking ref points at. IOW, I use my tracking refs not just "this is where the guy is", but "this is the last good one I fetched from that guy".

I could be persuaded to use reflog (e.g. "git diff his@{1}..his") and manual tagging (i.e. "git tag -f last-good-his his") myself, but this is "I'd _tolerate_ such a change myself", certainly not "I am happy with that change and I'd help you guys advocate it and try convincing others who shared my expectations to switch to reglog and manual tagging."

Previous: Daniel BarkalowNext: ir0s
Message 8 of 13 in “Local branch ahead of tracked remote branch but git push claims everything up-to-date”
  1. ir0sAug 20, 2008
  2. Alex RiesenAug 20, 2008
  3. Andreas FärberAug 20, 2008
  4. Avery PennarunAug 20, 2008
  5. Junio C HamanoAug 20, 2008
  6. Avery PennarunAug 20, 2008
  7. Daniel BarkalowAug 20, 2008
  8. Junio C HamanoAug 20, 2008
  9. ir0sAug 21, 2008
  10. Michael J GruberAug 21, 2008
  11. ir0sAug 21, 2008
  12. Michael J GruberAug 22, 2008
  13. ir0sAug 21, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.