undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure we error out if we can't remove a file on automatic merges.

Browse Source 
Pointed out by Junio.
This commit is contained in:
Linus Torvalds 2005-06-08 16:35:30 -07:00
parent 17ebe977d7
commit ae3858e7e9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-merge-one-file-script
View File

@ -21,13 +21,14 @@ case "${1:-.}${2:-.}${3:-.}" in
"$1..") "$1..")
echo "WARNING: $4 is removed in both branches." echo "WARNING: $4 is removed in both branches."
echo "WARNING: This is a potential rename conflict." echo "WARNING: This is a potential rename conflict."
rm -f -- "$4" || exit 1
exec git-update-cache --remove -- "$4" ;; exec git-update-cache --remove -- "$4" ;;
# #
# Deleted in one and unchanged in the other. # Deleted in one and unchanged in the other.
# #
"$1.." | "$1.$1" | "$1$1.") "$1.." | "$1.$1" | "$1$1.")
echo "Removing $4" echo "Removing $4"
rm -f -- "$4" rm -f -- "$4" || exit 1
exec git-update-cache --remove -- "$4" ;; exec git-update-cache --remove -- "$4" ;;
# #
# Added in one. # Added in one.