diff options
| author | Thomas Rast <trast@inf.ethz.ch> | 2012-03-12 22:47:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-12 14:57:37 -0700 |
| commit | 4eeb1de1c3855968bcd2d58b223fd187ae510d73 (patch) | |
| tree | 54d7452d6a46adfb304e805f20a12cf795d23966 | |
| parent | b8de3f4b8c1e01ddbaf9a482e2bd2ef80da39d55 (diff) | |
| download | git-4eeb1de1c3855968bcd2d58b223fd187ae510d73.tar.gz | |
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-x | git-am.sh | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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) |