AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:
CFG:
PT:0
S:andy.sharp@lsi.com
RQ:
SSV:mhbs.lsil.com
NSV:
SSH:
R:<Rendell.Fong@lsi.com>
MAID:2
X-Sylpheed-Privacy-System:
X-Sylpheed-Sign:0
SCF:#mh/Mailbox/sent
RMID:#imap/LSI/INBOX	0	1254791984.14287.219.camel@rendellf
X-Sylpheed-End-Special-Headers: 1
Date: Tue, 6 Oct 2009 13:10:49 -0700
From: Andrew Sharp <andy.sharp@lsi.com>
To: Rendell Fong <Rendell.Fong@lsi.com>
Subject: Re: git-status on kernel
Message-ID: <20091006131049.64c68bb4@ripper.onstor.net>
In-Reply-To: <1254791984.14287.219.camel@rendellf>
References: <20091005151811.37ec7303@ripper.onstor.net>
	<1254782201.14287.217.camel@rendellf>
	<20091005162122.471ddd75@ripper.onstor.net>
	<1254791984.14287.219.camel@rendellf>
Organization: LSI
X-Mailer: Sylpheed-Claws 2.6.0 (GTK+ 2.8.20; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit


$ git-status
fatal: bad object HEAD
# On branch onstor-2.6.22

~:^(


On Mon, 5 Oct 2009 19:19:44 -0600 Rendell Fong <Rendell.Fong@lsi.com>
wrote:

> ok, try again.
> 
> 
> On Mon, 2009-10-05 at 17:21 -0600, Andrew Sharp wrote:
> > On Mon, 5 Oct 2009 16:36:41 -0600 Rendell Fong
> > <Rendell.Fong@lsi.com> wrote:
> > 
> > > Those are the disputed files from Bill.  Don't know if they are
> > > supposed to be included in the change list or not.  It is still
> > > present in my workspace.
> > 
> > Disputed?
> > 
> > They aren't in the branch, so they shouldn't be in the git
> > repository either.  They have to match up.
> > 
> > > On Mon, 2009-10-05 at 16:18 -0600, Andrew Sharp wrote:
> > > > Hi R,
> > > > 
> > > > I copied your changes over from 33404, and I run git-status and
> > > > I get this:
> > > > 
> > > > $ git-status
> > > > # On branch onstor-2.6.22
> > > > # Changed but not updated:
> > > > #   (use "git add/rm <file>..." to update what will be
> > > > committed) #
> > > > #   deleted:    net/neteee-ui/Kconfig
> > > > #   deleted:    net/neteee-ui/Makefile
> > > > #   deleted:    net/neteee-ui/argvize.c
> > > > #   deleted:    net/neteee-ui/cli.c
> > > > #   deleted:    net/neteee-ui/cmdtable.c
> > > > #   deleted:    net/neteee-ui/commands.c
> > > > #   deleted:    net/neteee-ui/eee-simple-test.c
> > > > #   deleted:    net/neteee-ui/eee-simple-test.h
> > > > #   deleted:    net/neteee-ui/eee-test-both.c
> > > > #   deleted:    net/neteee-ui/eraline.c
> > > > #   deleted:    net/neteee-ui/getword.c
> > > > #   deleted:    net/neteee-ui/help.c
> > > > #   deleted:    net/neteee-ui/hist.c
> > > > #   deleted:    net/neteee-ui/more.c
> > > > #   deleted:    net/neteee-ui/pmon-ui.h
> > > > #   deleted:    net/neteee-ui/queue-api.c
> > > > #   deleted:    net/neteee-ui/queue-api.h
> > > > #   deleted:    net/neteee-ui/queue-error.h
> > > > #   deleted:    net/neteee-ui/queue.c
> > > > #   deleted:    net/neteee-ui/queue.h
> > > > #   deleted:    net/neteee-ui/rcon-shell.c
> > > > #   deleted:    net/neteee-ui/rcon-shell.h
> > > > #   deleted:    net/neteee-ui/sbm-commands.c
> > > > #   deleted:    net/neteee-ui/strlib.c
> > > > #   deleted:    net/neteee-ui/strlib.h
> > > > #   deleted:    net/neteee-ui/strlibc.h
> > > > #   deleted:    net/neteee-ui/uihdr.h
> > > > #   deleted:    net/neteee2/Kconfig
> > > > #   deleted:    net/neteee2/Makefile
> > > > #   deleted:    net/neteee2/eee-api.h
> > > > #   deleted:    net/neteee2/eee-app.c
> > > > #   deleted:    net/neteee2/eee-app.h
> > > > #   deleted:    net/neteee2/eee-debug.c
> > > > #   deleted:    net/neteee2/eee-desc.c
> > > > #   deleted:    net/neteee2/eee-drv.c
> > > > #   deleted:    net/neteee2/eee-drv.h
> > > > #   deleted:    net/neteee2/eee-error.h
> > > > #   deleted:    net/neteee2/eee-fwd-test.c
> > > > #   deleted:    net/neteee2/eee-fwd.c
> > > > #   deleted:    net/neteee2/eee-fwd.h
> > > > #   deleted:    net/neteee2/eee-init.c
> > > > #   deleted:    net/neteee2/eee-ipc.c
> > > > #   deleted:    net/neteee2/eee-ipc.h
> > > > #   deleted:    net/neteee2/eee-mem.c
> > > > #   deleted:    net/neteee2/eee-mem.h
> > > > #   deleted:    net/neteee2/eee-msg.c
> > > > #   deleted:    net/neteee2/eee-platform.c
> > > > #   deleted:    net/neteee2/eee-platform.h
> > > > #   deleted:    net/neteee2/eee-poll.c
> > > > #   deleted:    net/neteee2/eee-poll.h
> > > > #   deleted:    net/neteee2/eee-queue.c
> > > > #   deleted:    net/neteee2/eee-queue.h
> > > > #   deleted:    net/neteee2/eee-rcon.h
> > > > #   deleted:    net/neteee2/eee-rq.c
> > > > #   deleted:    net/neteee2/eee-rq.h
> > > > #   deleted:    net/neteee2/eee-shmem.h
> > > > #   deleted:    net/neteee2/eee-test.c
> > > > #   deleted:    net/neteee2/eee-test.h
> > > > #   deleted:    net/neteee2/eee-time.c
> > > > #   deleted:    net/neteee2/eee-time.h
> > > > #   deleted:    net/neteee2/eee-timer-api-test.c
> > > > #   deleted:    net/neteee2/eee-timer-api.c
> > > > #   deleted:    net/neteee2/eee-timer-api.h
> > > > #   deleted:    net/neteee2/eee-timer-tic.c
> > > > #   deleted:    net/neteee2/eee-timer.c
> > > > #   deleted:    net/neteee2/eee-timer.h
> > > > #   deleted:    net/neteee2/eee-utils.c
> > > > #   deleted:    net/neteee2/eee.h
> > > > #   deleted:    net/neteee2/req-queue-struct.h
> > > > #   deleted:    net/tpl/Kconfig
> > > > #   deleted:    net/tpl/Makefile
> > > > #   deleted:    net/tpl/bqueue.h
> > > > #   deleted:    net/tpl/cache.h
> > > > #   deleted:    net/tpl/eee-desc.h
> > > > #   deleted:    net/tpl/nfx-defs.h
> > > > #   deleted:    net/tpl/nfx-error.h
> > > > #   deleted:    net/tpl/nfx-types.h
> > > > #   deleted:    net/tpl/pkt-api.h
> > > > #   deleted:    net/tpl/pkt-queue-api.c
> > > > #   deleted:    net/tpl/pkt-queue-api.h
> > > > #   deleted:    net/tpl/pkt-queue-dcache.c
> > > > #   deleted:    net/tpl/pkt-queue-struct.h
> > > > #   deleted:    net/tpl/pkt-queue-test.c
> > > > #   deleted:    net/tpl/pkt.c
> > > > #   deleted:    net/tpl/pkt.h
> > > > #   deleted:    net/tpl/tpl-api.h
> > > > #   deleted:    net/tpl/tpl-fp-api.h
> > > > #   deleted:    net/tpl/tpl-fp.h
> > > > #   deleted:    net/tpl/tpl-ipc.c
> > > > #   deleted:    net/tpl/tpl-ipc.h
> > > > #   deleted:    net/tpl/tpl-msg.c
> > > > #   deleted:    net/tpl/tpl-rcv.c
> > > > #   deleted:    net/tpl/tpl-utils.c
> > > > #   deleted:    net/tpl/tpl.c
> > > > #   deleted:    net/tpl/tpl.h
> > > > #
> > > > no changes added to commit (use "git add" and/or "git commit
> > > > -a")
> > > 
> 
