git-merge-one-file: resurrect leading path creation.
authorJunio C Hamano <junkio@cox.net>
Tue, 6 Dec 2005 08:07:58 +0000 (00:07 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 6 Dec 2005 08:07:58 +0000 (00:07 -0800)
commitbe61db922a230ae2638c27c071ee4b8c98f01f72
treebbd042215a652422d50ca6425226af5dc2fa4cc1
parentbb6d7b893e7f9f22e58a63d871b5b4c87b887513
git-merge-one-file: resurrect leading path creation.

Since we do not use git-update-index followed by
git-checkout-index -u to create the half-merged file on
conflicting case anymore, we need to make sure the leading
directories are created here.

Maybe a better solution would be to allow update-index to add to
higher stage, and checkout-index to extract from such, but that
is a change slightly bigger than I would like to have so close
to 1.0, so this should do for now.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-one-file.sh