From 4eeb1de1c3855968bcd2d58b223fd187ae510d73 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Mon, 12 Mar 2012 22:47:19 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-am.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-am.sh b/git-am.sh index 0bd290b4ae..faae820719 100755 --- 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) -- 2.32.0.93.g670b81a890