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

Peculiar behavior of git 1.5.6

From
LFLarry Finger <larry.finger@lwfinger.net>
Date
Sep 4, 2008, 05:43 UTC
Message-ID
<48BF759B.9090309@lwfinger.net>

On one of my systems, I found strange behavior for git-1.5.6.GIT. On the first pull of the linux-2.6 tree, I got a message that one file was not uptodate. When I investigated any possible differences with git-diff, there were none. A subsequent git-pull worked fine. I lost the console output for linux-2.6, but the same thing happened for Linville's wireless-testing, as shown below:

finger@sonylap:~/wireless-testing> git --version git version 1.5.6.GIT finger@sonylap:~/wireless-testing> git pull error: Entry 'drivers/bluetooth/bt3c_cs.c' not uptodate. Cannot merge. fatal: merging of trees 294e21019bac11cb782e8d1893d02ce98ed816a4 and 810d24221c9c532475af90d1b7ba9ca381dc3696 failed Merge with strategy recursive failed. finger@sonylap:~/wireless-testing> git diff > tmp finger@sonylap:~/wireless-testing> cat tmp finger@sonylap:~/wireless-testing> git pull Removed Documentation/usb/auerswald.txt Auto-merged MAINTAINERS ...

Is this a bug in git, an incompatibility between my version and that of the server at kernel.org, or something else?

Thanks,
Larry
Next: Johannes Sixt
Message 1 of 7 in “Peculiar behavior of git 1.5.6”
  1. Larry FingerSep 4, 2008
  2. Johannes SixtSep 4, 2008
  3. Junio C HamanoSep 4, 2008
  4. Jonathan del StrotherSep 4, 2008
  5. Re*: Peculiar behavior of git 1.5.6Junio C Hamano, Sep 4, 2008
  6. Nanako ShiraishiSep 4, 2008
  7. Larry FingerSep 4, 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.