X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-merge-one-file.sh;h=739a07292afad6baf5b0a34ff1405eb2c90f5825;hb=15bf57a18aaf10c038e2026dfe54281edbb6080a;hp=b08597de29afc6bc1aaddf7b817bc122cd517b04;hpb=fd66dbf5297a4badec8c2accf8a0f9bd72e3f693;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index b08597de..739a0729 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -25,7 +25,8 @@ case "${1:-.}${2:-.}${3:-.}" in
 		echo "Removing $4"
 	fi
 	if test -f "$4"; then
-		rm -f -- "$4"
+		rm -f -- "$4" &&
+		rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null
 	fi &&
 		exec git-update-index --remove -- "$4"
 	;;
@@ -78,11 +79,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 		;;
 	esac
 
-	# We reset the index to the first branch, making
-	# git-diff-file useful
-	git-update-index --add --cacheinfo "$6" "$2" "$4"
-		git-checkout-index -u -f -- "$4" &&
-		merge "$4" "$orig" "$src2"
+	merge "$4" "$orig" "$src2"
 	ret=$?
 	rm -f -- "$orig" "$src2"