summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-06 08:07:58 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-06 08:07:58 (GMT)
commitbe61db922a230ae2638c27c071ee4b8c98f01f72 (patch)
treebbd042215a652422d50ca6425226af5dc2fa4cc1
parentbb6d7b893e7f9f22e58a63d871b5b4c87b887513 (diff)
downloadgit-be61db922a230ae2638c27c071ee4b8c98f01f72.zip
git-be61db922a230ae2638c27c071ee4b8c98f01f72.tar.gz
git-be61db922a230ae2638c27c071ee4b8c98f01f72.tar.bz2
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>
-rwxr-xr-xgit-merge-one-file.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index eafef77..88a5da9 100755
--- 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"