From: Petr Baudis Date: Mon, 18 Apr 2005 21:58:20 GMT Subject: Re: [PATCH] fix bug in read-cache.c which loses files when merging a tree Message-ID: <20050418215819.GH5554@pasky.ji.cz> In-Reply-To: Dear diary, on Mon, Apr 18, 2005 at 11:19:46PM CEST, I got a letter where Linus Torvalds 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