Skip to content

Commit 6c15a1c

Browse files
committed
am: officially deprecate -b/--binary option
We have had these options as harmless no-op for more than 3 years without officially deprecating them. Let's announce the deprecation and start warning against their use, but without failing the command just not yet, so that we can later repurpose the option if we want to in the future. Signed-off-by: Junio C Hamano <[email protected]>
1 parent fa678fe commit 6c15a1c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Documentation/RelNotes/1.7.10.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Compatibility Notes
2626
Git v1.7.8 or newer.
2727

2828
* The "--binary/-b" options to "git am" have been a no-op for quite a
29-
while and was deprecated in mid 2008 (v1.6.0). When you give these
30-
options to "git am", it will now fail with an error.
29+
while and were deprecated in mid 2008 (v1.6.0). When you give these
30+
options to "git am", it will now warn and ask you not to use them.
3131

3232

3333
Updates since v1.7.9

git-am.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@ do
380380
-i|--interactive)
381381
interactive=t ;;
382382
-b|--binary)
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."
383+
echo >&2 "The $1 option has been a no-op for long time, and"
384+
echo >&2 "it will be removed. Please do not use it anymore."
385385
;;
386386
-3|--3way)
387387
threeway=t ;;

0 commit comments

Comments
 (0)