mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-merge-one-file: resurrect leading path creation.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-12-06 00:07:58 -08:00
parent bb6d7b893e
commit be61db922a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-merge-one-file.sh
View File

@ -16,6 +16,14 @@
# been handled already by git-read-tree, but that one doesn't # been handled already by git-read-tree, but that one doesn't
# do any merges that might change the tree layout. # 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 case "${1:-.}${2:-.}${3:-.}" in
# #
# Deleted in both or deleted in one and unchanged in the other # 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. # 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 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. # 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" && 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" merge "$4" "$orig" "$src2"
ret=$? ret=$?
rm -f -- "$orig" "$src2" rm -f -- "$orig" "$src2"