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

git pull error message woes

From
Matthias Kestenholz <mk@spinlock.ch>
Date
Jun 19, 2008, 07:32 UTC
Message-ID
<1213860773.6444.9.camel@localhost>
Hi,

I noticed strange behavior while pulling git.git today (this isn't new, it just occurred to me for the first time today that there is something wrong going on)

I run the 'pu' branch most of the time, and do not create a local branch because 'pu' is constantly rebased. I just run git checkout origin/pu after pulling (I know I should fetch if I don't want to fetch+merge, but it's hard to retrain the fingers)

Although I am on no branch ($curr_branch is empty), I get the error message from error_on_no_merge_candidates instead of being notified that I am on no branch currently. Something around line 150-160 in git-pull.sh does not seem to work as it should.

The reason might be, that every line in .git/FETCH_HEAD is marked as not-for-merge?

I don't know if that's the sign of a deeper problem or if it's just confusing behavior.

I tried fixing it myself, but got lost somewhere in the fetch machinery.
Matthias
Next: Daniel Barkalow
Message 1 of 2 in “git pull error message woes”
  1. Matthias KestenholzJun 19, 2008
  2. Daniel BarkalowJun 19, 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.