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 <gitster@pobox.com>

diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index 65df74b9c45494d5c8c6cfb9df6acae04317903e..6286485bdb67727ce4bace90c7ffae9a2e832e89 100644 (file)
--- a/Documentation/RelNotes/1.7.10.txt
+++ b/Documentation/RelNotes/1.7.10.txt
@@ -26,8 +26,8 @@ Compatibility Notes
    Git v1.7.8 or newer.
 
  * The "--binary/-b" options to "git am" have been a no-op for quite a
    Git v1.7.8 or newer.
 
  * The "--binary/-b" options to "git am" have been a no-op for quite a

-   while and was deprecated in mid 2008 (v1.6.0).  When you give these
-   options to "git am", it will now fail with an error.
+   while and were deprecated in mid 2008 (v1.6.0).  When you give these
+   options to "git am", it will now warn and ask you not to use them.

 
 
 Updates since v1.7.9
 
 
 Updates since v1.7.9

diff --git a/git-am.sh b/git-am.sh
index faae82071985e756af18f2f5644b8a4a2bb3bd03..4da0ddafc4bf2029823148e7285085661c134497 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -380,8 +380,8 @@ do
        -i|--interactive)
                interactive=t ;;
        -b|--binary)
        -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."
+               echo >&2 "The $1 option has been a no-op for long time, and"
+               echo >&2 "it will be removed. Please do not use it anymore."

                ;;
        -3|--3way)
                threeway=t ;;
                ;;
        -3|--3way)
                threeway=t ;;