public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Larry Finger <Larry.Finger@lwfinger•net>
To: git@vger•kernel.org
Subject: Peculiar behavior of git 1.5.6
Date: Thu, 04 Sep 2008 00:43:55 -0500	[thread overview]
Message-ID: <48BF759B.9090309@lwfinger.net> (raw)

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             reply	other threads:[~2008-09-04  5:49 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-04  5:43 Larry Finger [this message]
2008-09-04  8:09 ` Peculiar behavior of git 1.5.6 Johannes Sixt
2008-09-04  8:35   ` Junio C Hamano
2008-09-04  9:11     ` Jonathan del Strother
2008-09-04  9:41       ` Re*: " Junio C Hamano
2008-09-04 10:20         ` Nanako Shiraishi
2008-09-04 16:05         ` Larry Finger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=48BF759B.9090309@lwfinger.net \
    --to=larry.finger@lwfinger$(echo .)net \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox