X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-apply-patch-script;h=6261fd85f29f6ee1441e530978ccc5374271cc6e;hb=46e63efc072bc440e4c6aad33d3157b70f5172b6;hp=13ec1c4490612f524f9b1070a57229cdc2c50aed;hpb=74c7cfa875448c71a18d21a0cc7c973afe759fa5;p=git.git diff --git a/git-apply-patch-script b/git-apply-patch-script index 13ec1c44..6261fd85 100755 --- a/git-apply-patch-script +++ b/git-apply-patch-script @@ -8,9 +8,12 @@ # case "$#" in -2) +1) echo >&2 "cannot handle unmerged diff on path $1." exit 1 ;; +8 | 9) + echo >&2 "cannot handle rename diff between $1 and $8 yet." + exit 1 ;; esac name="$1" tmp1="$2" hex1="$3" mode1="$4" tmp2="$5" hex2="$6" mode2="$7"