diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-25 02:24:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 16:52:16 -0700 |
| commit | aacc15ec5261fca8a02570f93028e3ac4213caae (patch) | |
| tree | 876df2d64d285a7cd2d4624fa9657b4c0eab2602 | |
| parent | 1abb3f14c872ac1b5b70db4334b21dde60e57b7a (diff) | |
| download | git-aacc15ec5261fca8a02570f93028e3ac4213caae.tar.gz git-aacc15ec5261fca8a02570f93028e3ac4213caae.tar.xz | |
[PATCH] git-merge-one-file-script: do not misinterpret rm failure.
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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rwxr-xr-x | git-merge-one-file-script | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-merge-one-file-script b/git-merge-one-file-script index 88ad3edd6..9802f6703 100755 --- 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" ;; # |