diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 16:54:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 16:54:23 -0700 |
| commit | 566487c8a617c12d68bf22c7078bce0b94fc8121 (patch) | |
| tree | a0937604a02425fc618e2d2017f4266ca9240052 | |
| parent | [PATCH] git-merge-one-file-script cleanups from Cogito (diff) | |
| parent | Make sure we error out if we can't remove a file on automatic merges. (diff) | |
| download | tgif-566487c8a617c12d68bf22c7078bce0b94fc8121.tar.xz | |
Merge my and Petr's git-merge-one-file-script modifications
| -rwxr-xr-x | git-merge-one-file-script | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge-one-file-script b/git-merge-one-file-script index 73e1c50bff..f0353c14b4 100755 --- a/git-merge-one-file-script +++ b/git-merge-one-file-script @@ -23,7 +23,8 @@ case "${1:-.}${2:-.}${3:-.}" in "$1..") echo "WARNING: $4 is removed in both branches." echo "WARNING: This is a potential rename conflict." - exec git-update-cache --remove -- "$4" + rm -f -- "$4" && + exec git-update-cache --remove -- "$4" ;; # |