git-am: error out when seeing -b/--binary

The --binary option to git-apply has been a no-op since 2b6eef9 (Make
apply --binary a no-op., 2006-09-06) and was deprecated in cb3a160
(git-am: ignore --binary option, 2008-08-09).

We could remove it outright, but let's be nice to people who still
have scripts saying 'git am -b' (if they exist) and tell them the
reason for the sudden failure.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-am.sh b/git-am.sh
index 0bd290b4ae990df4e0553700fa4fa38696e2b980..faae82071985e756af18f2f5644b8a4a2bb3bd03 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -380,7 +380,9 @@ do
        -i|--interactive)
                interactive=t ;;
        -b|--binary)
-               : ;;
+               echo >&2 "The -b/--binary option was deprecated in 1.6.0 and removed in 1.7.10."
+               die "Please adjust your scripts."
+               ;;
        -3|--3way)
                threeway=t ;;
        -s|--signoff)