mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 18:33:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Thomas Rast 2012-03-12 22:47:19 +01:00 committed by Junio C Hamano
parent b8de3f4b8c
commit 4eeb1de1c3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-am.sh
View File

@ -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)