From: Jens Axboe <axboe@suse.de>
To: Matthias Urlichs <smurf@smurf.noris.de>
Cc: git@vger.kernel.org
Subject: Re: git merging
Date: Mon, 20 Jun 2005 16:13:04 +0200 [thread overview]
Message-ID: <20050620141303.GN15021@suse.de> (raw)
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
next prev parent reply other threads:[~2005-06-20 14:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20050617133440.GI6957@suse.de>
[not found] ` <Pine.LNX.4.58.0506170937260.8487@ppc970.osdl.org>
[not found] ` <20050617175653.GS6957@suse.de>
[not found] ` <Pine.LNX.4.58.0506171101450.2268@ppc970.osdl.org>
[not found] ` <20050617181156.GT6957@suse.de>
[not found] ` <Pine.LNX.4.58.0506171132390.2268@ppc970.osdl.org>
[not found] ` <20050617183914.GX6957@suse.de>
2005-06-17 18:50 ` git merging Linus Torvalds
2005-06-17 19:16 ` Jens Axboe
2005-06-17 23:08 ` Jeff Garzik
2005-06-17 23:31 ` Linus Torvalds
2005-06-17 23:51 ` Jeff Garzik
2005-06-18 0:13 ` Linus Torvalds
2005-06-20 12:30 ` Jens Axboe
2005-06-20 13:48 ` Matthias Urlichs
2005-06-20 14:13 ` Jens Axboe [this message]
2005-06-20 15:58 ` Linus Torvalds
2005-06-20 16:06 ` Daniel Barkalow
2005-06-20 19:21 ` Matthias Urlichs
2005-06-20 20:38 ` Jens Axboe
2005-06-20 21:15 ` Linus Torvalds
2005-06-21 14:59 ` Jens Axboe
2005-06-21 15:53 ` Linus Torvalds
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=20050620141303.GN15021@suse.de \
--to=axboe@suse.de \
--cc=git@vger.kernel.org \
--cc=smurf@smurf.noris.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).