From: Petr Baudis <pasky@ucw.cz>
To: Linus Torvalds <torvalds@osdl.org>
Cc: James Bottomley <James.Bottomley@SteelEye.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] fix bug in read-cache.c which loses files when merging a tree
Date: Mon, 18 Apr 2005 23:58:20 +0200 [thread overview]
Message-ID: <20050418215819.GH5554@pasky.ji.cz> (raw)
In-Reply-To: <Pine.LNX.4.58.0504181330450.15725@ppc970.osdl.org>
Dear diary, on Mon, Apr 18, 2005 at 11:19:46PM CEST, I got a letter
where Linus Torvalds <torvalds@osdl.org> told me that...
> I suspect that I should just pass in the SHA1 of the files to the
> "merge-one-file-script" from "merge-cache", rather than unpacking it.
> After all, the merging script can do the unpacking itself with a simple
> "cat-file blob $sha1".
So, I'm confused. Why did you introduce unpack-file instead of doing
just this?
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
next prev parent reply other threads:[~2005-04-18 21:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-18 18:17 [PATCH] fix bug in read-cache.c which loses files when merging a tree James Bottomley
2005-04-18 19:25 ` Linus Torvalds
[not found] ` <1113854941.4998.61.camel@mulgrave>
2005-04-18 21:19 ` Linus Torvalds
2005-04-18 21:58 ` Petr Baudis [this message]
2005-04-18 22:09 ` 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=20050418215819.GH5554@pasky.ji.cz \
--to=pasky@ucw.cz \
--cc=James.Bottomley@SteelEye.com \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/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).