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

[bug in next ?] git-fetch/git-push issue

From
Pierre Habouzit <madcoder@debian.org>
Date
Nov 5, 2007, 17:56 UTC
Message-ID
<20071105175654.GD6205@artemis.corp>
With the current tip of next[0], I have this bizare issue:
  * I have two branches say master, and next, I'm on next.
  * my master lags behind origin/master, but next is a fast-forward wrt
    origin/next.
Now I git push:
    ┌─(18:16)──<~/some/repo next>──
    └[artemis] git push
    error: remote 'refs/heads/master' is not an ancestor of
     local  'refs/heads/master'.
     Maybe you are not up-to-date and need to pull first?
    updating 'refs/heads/next'
      from xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
      to   yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
    Counting objects: 24, done.
    Compressing objects: 100% (14/14), done.
    Writing objects: 100% (14/14), done.
    Total 14 (delta 12), reused 0 (delta 0)
    refs/heads/next: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -> yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
    updating local tracking ref 'refs/remotes/origin/master'
    updating local tracking ref 'refs/remotes/origin/next'
And then I fetch, and here happens something really awkward:
    ┌─(18:17)──<~/some/repo next>──
    └[artemis] git fetch
    From ssh://some.host/some/repo.git
     * [new branch]      master -> origin/master

I believe there is something rotten in the kingdom of Denmark… though my heads seems to always be OK, I think it's just an output issue.

The fun part is that if next has nothing to push, nothing happens:
    ┌─(18:55)──<~/dev/mmsx next>──
    └[artemis] git push
    error: remote 'refs/heads/master' is not an ancestor of
     local  'refs/heads/master'.
     Maybe you are not up-to-date and need to pull first?
    error: failed to push to 'ssh://some.host/some/repo.git'
    ┌─(18:55)──<~/dev/mmsx next>──
    └[artemis] git fetch && echo $?
    0
  [0] actually it's a bit farther than the current next, but for
      parseopt thingies that are irrelevant here. My current origin/next
      is 76374a65c41b80fa83f27b4dd924bd3967a07d69
-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org
Next: Daniel Barkalow
Message 1 of 16 in “[bug in next ?] git-fetch/git-push issue”
  1. Pierre HabouzitNov 5, 2007
  2. Daniel BarkalowNov 5, 2007
  3. Jeff KingNov 5, 2007
  4. Daniel BarkalowNov 5, 2007
  5. Jeff KingNov 5, 2007
  6. Junio C HamanoNov 5, 2007
  7. Daniel BarkalowNov 5, 2007
  8. Daniel BarkalowNov 5, 2007
  9. Jeff KingNov 6, 2007
  10. Pierre HabouzitNov 5, 2007
  11. Pierre HabouzitNov 6, 2007
  12. Jeff KingNov 6, 2007
  13. Junio C HamanoNov 6, 2007
  14. Jeff KingNov 6, 2007
  15. Pierre HabouzitNov 6, 2007
  16. Pierre HabouzitNov 7, 2007

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.