From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Mon, 20 Jun 2005 13:48:31 GMT
Subject: Re: git merging
Message-ID: <pan.2005.06.20.13.48.30.2680@smurf.noris.de>
In-Reply-To: <20050620123053.GI15021@suse.de>

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?

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
He that is giddy thinks the world turns round.
		-- William Shakespeare, "The Taming of the Shrew"