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>

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index eafef770dbad16b48f25962cd67e8e380f3c8d48..88a5da99f60895149b2e6bb4be85fbe7766b4ce1 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -16,6 +16,14 @@
 # been handled already by git-read-tree, but that one doesn't
 # do any merges that might change the tree layout.
 
+verify_path() {
+    file="$1"
+    dir=`dirname "$file"` &&
+    mkdir -p "$dir" &&
+    rm -f -- "$file" &&
+    : >"$file"
+}
+
 case "${1:-.}${2:-.}${3:-.}" in
 #
 # Deleted in both or deleted in one and unchanged in the other
@@ -90,9 +98,9 @@ case "${1:-.}${2:-.}${3:-.}" in
        # Create the working tree file, with the correct permission bits.
        # we can not rely on the fact that our tree has the path, because
        # we allow the merge to be done in an unchecked-out working tree.
-       rm -f "$4" &&
+       verify_path "$4" &&
                git-cat-file blob "$2" >"$4" &&
-               case "$6" in *7??) chmod +x "$4" ;; esac &&
+               case "$6" in *7??) chmod +x -- "$4" ;; esac &&
                merge "$4" "$orig" "$src2"
        ret=$?
        rm -f -- "$orig" "$src2"