Bug 23838

Summary:	xf86-video-geode: git problem when updating
Product:	xorg	Reporter:	Gaetan Nadon <memsize>
Component:	Driver/geode	Assignee:	Xorg Project Team <xorg-team>
Status:	RESOLVED FIXED	QA Contact:	Xorg Project Team <xorg-team>
Severity:	normal
Priority:	medium	CC:	airlied, ajax, martin-eric.racine, peter.hutterer
Version:	git	Keywords:	janitor
Hardware:	x86-64 (AMD64)
OS:	Linux (All)
Whiteboard:
i915 platform:		i915 features:

Description Gaetan Nadon 2009-09-10 05:58:15 UTC

Doing a git pull on a newly cloned repo always produce this message:
------------------------------------------------------------------
From git://anongit.freedesktop.org/git/xorg/driver/xf86-video-geode
   fc77269..6513103  master     -> origin/master
Already up-to-date.
-------------------------------------------------------------------

Doing a git status:
-------------------------------------------------------------------
# On branch master
# Your branch is ahead of 'origin/master' by 52 commits.
#
nothing to commit (working directory clean)
-------------------------------------------------------------------

The commits in questions are from 651310328e3cfc5c4936cf5df1dcaf7d319d20f6 to  fc772694ec04f729b5a1cdced7f33dc406c1d67f

I have been doing many "git pull" recently, so this is fairly recent, like a day or two. None of the other 267 other modules I pull from have this behavior, so it is unlikely the problem is on my workstation.

I don't have much experience with git, if you look in the web git browser, the 52nd commit is tagged with HEAD:
2008-11-18	DCON: Mark 1200x900 mode as preferred.HEAD

It would make sense that if the HEAD is pointing at that commit, the master branch would be ahead by 52 commits.

Comment 1 Martin-Éric Racine 2010-02-20 19:07:26 UTC

I wouldn't be surprised if someone made a mistake with their tagging, back when they created branches.

Anyhow, does the issue still apply?

Comment 2 Gaetan Nadon 2010-02-21 06:25:26 UTC

(In reply to comment #1)
> I wouldn't be surprised if someone made a mistake with their tagging, back when
> they created branches.
> 
> Anyhow, does the issue still apply?
> 

Yes, it does.
http://cgit.freedesktop.org/xorg/driver/xf86-video-geode/commit/?id=fc772694ec04f729b5a1cdced7f33dc406c1d67f

It does not prevent applying patches, but it has all sorts of annoying behaviours.
A branch called "HEAD" was created. In the git browser, top right corner, you can switch from 'master' to 'HEAD' branch.

Comment 3 Gaetan Nadon 2010-02-21 07:26:35 UTC

(In reply to comment #2)
> (In reply to comment #1)
> > I wouldn't be surprised if someone made a mistake with their tagging, back when
> > they created branches.
> > 
> > Anyhow, does the issue still apply?
> > 
> 
> Yes, it does.
> http://cgit.freedesktop.org/xorg/driver/xf86-video-geode/commit/?id=fc772694ec04f729b5a1cdced7f33dc406c1d67f
> 
> It does not prevent applying patches, but it has all sorts of annoying
> behaviours.
> A branch called "HEAD" was created. In the git browser, top right corner, you
> can switch from 'master' to 'HEAD' branch.
> 

This HEAD branch should be deleted with the following command:
    git push origin :HEAD      # Note the colon before HEAD

I found someone who had the same problem:
http://support.github.com/discussions/repos/882-unable-to-fetch-from-private-repo-bad-tree-object#comment_209311

Comment 4 Martin-Éric Racine 2010-04-14 12:57:02 UTC

Deleted branch HEAD as suggested in comment 3.

Comment 5 Martin-Éric Racine 2010-04-14 12:58:54 UTC

$ git push origin :HEAD 
error: unable to find 0000000000000000000000000000000000000000
fatal: git-cat-file 0000000000000000000000000000000000000000: bad file
fatal: bad object 0000000000000000000000000000000000000000
To ssh://q-funk@git.freedesktop.org/git/xorg/driver/xf86-video-geode.git
 - [deleted]         HEAD

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.