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>
Thomas Rast committed
Mar 12, 2012 at 22:47 UTC
4eeb1de1c3855968bcd2d58b223fd187ae510d73
1 file changed
+3
-1
git-am.sh
+3
-1
@@ -380,7 +380,9 @@ do
380
-i|--interactive)
381
interactive=t ;;
382
-b|--binary)
383
- : ;;
383
+ echo >&2 "The -b/--binary option was deprecated in 1.6.0 and removed in 1.7.10."
384
+ die "Please adjust your scripts."
385
+ ;;
386
-3|--3way)
387
threeway=t ;;
388
-s|--signoff)