# [PATCH] git-merge-one-file-script: do not misinterpret rm failure

1 messages from 2005-06-25 to 2005-06-25. Participants: Junio C Hamano.
Thread: https://gitlist.dev/t/1023

## Junio C Hamano, 2005-06-25 06:20

Subject: [PATCH] git-merge-one-file-script: do not misinterpret rm failure
Message-ID: <7vpsub555a.fsf@assigned-by-dhcp.cox.net>
URL: https://gitlist.dev/e/7vpsub555a.fsf%40assigned-by-dhcp.cox.net

```
When a merge adds a file DF and removes a directory there by
deleting a path DF/DF, git-merge-one-file-script can be called
for the removal of DF/DF when the path DF is already created by
"git-read-tree -m -u".  When this happens, we get confused by a
failure return from 'rm -f -- "$4"' (where $4 is DF/DF); finding
file DF there the "rm -f" command complains that DF is not a
directory.

What we want to ensure is that there is no file DF/DF in this
case. Avoid getting ourselves confused by first checking if
there is a file, and only then try to remove it (and check for
failure from the "rm" command). 

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
cd /opt/packrat/playpen/public/in-place/git/git.junio/
jit-diff : git-merge-one-file-script
# - master: Add more tests for read-tree --emu23.
# + (working tree)

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -22,8 +22,11 @@ case "${1:-.}${2:-.}${3:-.}" in
 #
 "$1.." | "$1.$1" | "$1$1.")
 	echo "Removing $4"
-	rm -f -- "$4" &&
-		exec git-update-cache --remove -- "$4"
+	if test -f "$4"
+	then
+		rm -f -- "$4"
+	fi &&
+	exec git-update-cache --remove -- "$4"
 	;;
 
 #




```