From be61db922a230ae2638c27c071ee4b8c98f01f72 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 6 Dec 2005 00:07:58 -0800 Subject: 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 --- git-merge-one-file.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'git-merge-one-file.sh') diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index eafef770db..88a5da99f6 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" -- cgit v1.2.3 From b539c5e8fbd36e38eb8f589e11aa5b136ddce753 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 7 Dec 2005 00:50:33 -0800 Subject: git-merge-one: new merge world order. This does two things: - Use new --stage=2 option to create the working tree file with leading paths and correct permission bits using checkout-index, as before. - Make sure we do not confuse "merge" program when the file being merged has an unfortunate name, '-L'. Signed-off-by: Junio C Hamano --- git-merge-one-file.sh | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'git-merge-one-file.sh') diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index 88a5da99f6..7dee88a733 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -16,14 +16,6 @@ # 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 @@ -95,15 +87,16 @@ case "${1:-.}${2:-.}${3:-.}" in ;; esac - # 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. - verify_path "$4" && - git-cat-file blob "$2" >"$4" && - case "$6" in *7??) chmod +x -- "$4" ;; esac && - merge "$4" "$orig" "$src2" + # Be careful for funny filename such as "-L" in "$4", which + # would confuse "merge" greatly. + src1=`git-unpack-file $2` + merge "$src1" "$orig" "$src2" ret=$? - rm -f -- "$orig" "$src2" + + # Create the working tree file, using "our tree" version from the + # index, and then store the result of the merge. + git-checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4" + rm -f -- "$orig" "$src1" "$src2" if [ "$6" != "$7" ]; then echo "ERROR: Permissions conflict: $5->$6,$7." -- cgit v1.2.3