summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@inf.ethz.ch>2012-03-12 21:47:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-12 21:57:37 (GMT)
commit4eeb1de1c3855968bcd2d58b223fd187ae510d73 (patch)
tree54d7452d6a46adfb304e805f20a12cf795d23966
parentb8de3f4b8c1e01ddbaf9a482e2bd2ef80da39d55 (diff)
downloadgit-4eeb1de1c3855968bcd2d58b223fd187ae510d73.zip
git-4eeb1de1c3855968bcd2d58b223fd187ae510d73.tar.gz
git-4eeb1de1c3855968bcd2d58b223fd187ae510d73.tar.bz2
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>
-rwxr-xr-xgit-am.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 0bd290b..faae820 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)