From: Jens Axboe <axboe@suse.de>
Date: Mon, 20 Jun 2005 14:13:04 GMT
Subject: Re: git merging
Message-ID: <20050620141303.GN15021@suse.de>
In-Reply-To: <pan.2005.06.20.13.48.30.2680@smurf.noris.de>

On Mon, Jun 20 2005, Matthias Urlichs wrote:
> Hi, Jens Axboe wrote:
> 
> > error: cannot map sha1 file c39ae07f393806ccf406ef966e9a15afc43cc36a
> > bad object in tag 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c
> 
> What does "git-cat-file -t" say on these two -- are they botth vald commit
> objects?

axboe@nelson:[.]l/git/linux-2.6-block.git $ git-cat-file -t c39ae07f393806ccf406ef966e9a15afc43cc36a
error: cannot map sha1 file c39ae07f393806ccf406ef966e9a15afc43cc36a
fatal: git-cat-file c39ae07f393806ccf406ef966e9a15afc43cc36a: bad file
axboe@nelson:[.]l/git/linux-2.6-block.git $ git-cat-file -t 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c
tag

-- 
Jens Axboe