X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-one-file.sh;h=906098dda5a2e9f4490b518eadbdaa4332e8793b;hb=1c2c10b6e6d86066d68635a2a968c7162498ea41;hp=9a049f426d1ad9ed268877e3bda917ee9cc8f315;hpb=57ae0d09ed3c4e409bed78b77322fa5e9bad3f3f;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 9a049f42..906098dd 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -79,7 +79,13 @@ case "${1:-.}${2:-.}${3:-.}" in
 		;;
 	esac
 
-	merge "$4" "$orig" "$src2"
+	# 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" &&
+		git-cat-file blob "$2" >"$4" &&
+		case "$6" in *7??) chmod +x "$4" ;; esac &&
+		merge "$4" "$orig" "$src2"
 	ret=$?
 	rm -f -- "$orig" "$src2"