From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Thomas Rast <trast@student.ethz.ch>, Willy Tarreau <w@1wt.eu>,
Greg KH <greg@kroah.com>, Ben Hutchings <ben@decadent.org.uk>,
linux-kernel@vger.kernel.org
Subject: [PATCH] git-am: officially deprecate -b/--binary
Date: Tue, 13 Mar 2012 11:38:27 -0700 [thread overview]
Message-ID: <7vsjhcuz18.fsf_-_@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vipi8wect.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Tue, 13 Mar 2012 11:22:10 -0700")
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>
---
Documentation/RelNotes/1.7.10.txt | 4 ++--
git-am.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index 65df74b..6286485 100644
--- 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
- 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
diff --git a/git-am.sh b/git-am.sh
index faae820..db6ade3 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -380,8 +380,8 @@ 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."
+ echo >&2 "The $1 option was deprecated in 1.6.0 and will be removed."
+ echo >&2 "Please do not use it anymore."
;;
-3|--3way)
threeway=t ;;
next prev parent reply other threads:[~2012-03-13 18:38 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <feb44625a10a45049eddf27890e95d54@local>
2012-03-12 0:20 ` [ 00/12] 2.6.32.59-longterm review Willy Tarreau
2012-03-12 0:20 ` [ 01/12] compat: Re-add missing asm/compat.h include to fix compile breakage on s390 Willy Tarreau
2012-03-12 0:20 ` [ 02/12] Remove COMPAT_IA32 support Willy Tarreau
2012-03-12 1:07 ` Ben Hutchings
2012-03-12 2:49 ` Greg KH
2012-03-12 6:30 ` Willy Tarreau
2012-03-12 6:48 ` stripping [PATCH] without losing later tags from mailed patches (Re: [ 02/12] Remove COMPAT_IA32 support) Jonathan Nieder
2012-03-12 8:58 ` Willy Tarreau
2012-03-12 15:20 ` Greg KH
2012-03-12 15:24 ` Willy Tarreau
2012-03-12 16:41 ` Thomas Rast
2012-03-12 16:53 ` Willy Tarreau
2012-03-12 16:57 ` Jonathan Nieder
2012-03-12 18:04 ` Junio C Hamano
2012-03-12 18:50 ` Willy Tarreau
2012-03-12 18:54 ` Jonathan Nieder
2012-03-12 19:17 ` Willy Tarreau
2012-03-12 21:47 ` Thomas Rast
2012-03-12 21:56 ` [PATCH] git-am: error out when seeing -b/--binary Jonathan Nieder
2012-03-12 22:03 ` Thomas Rast
2012-03-12 22:22 ` Jonathan Nieder
2012-03-13 15:31 ` Thomas Rast
2012-03-13 17:31 ` Junio C Hamano
2012-03-13 17:51 ` Jonathan Nieder
2012-03-13 18:22 ` Junio C Hamano
2012-03-13 18:38 ` Junio C Hamano [this message]
2012-03-12 22:12 ` Junio C Hamano
2012-03-12 21:57 ` stripping [PATCH] without losing later tags from mailed patches (Re: [ 02/12] Remove COMPAT_IA32 support) Junio C Hamano
2012-03-12 16:40 ` Junio C Hamano
2012-03-12 16:48 ` Willy Tarreau
2012-03-12 17:57 ` Junio C Hamano
2012-03-12 18:45 ` Willy Tarreau
2012-03-12 19:29 ` Junio C Hamano
2012-03-12 17:12 ` Greg KH
2012-03-12 18:01 ` Junio C Hamano
2012-03-12 19:26 ` Greg KH
2012-03-12 19:51 ` Junio C Hamano
2012-03-12 20:19 ` Willy Tarreau
2012-03-12 15:25 ` [ 02/12] Remove COMPAT_IA32 support Ben Hutchings
2012-03-12 17:02 ` Arnd Bergmann
2012-03-12 17:14 ` Willy Tarreau
2012-03-12 19:34 ` Ben Hutchings
2012-03-12 19:45 ` Willy Tarreau
2012-03-12 0:20 ` [ 03/12] writeback: fixups for !dirty_writeback_centisecs Willy Tarreau
2012-03-12 0:20 ` [ 04/12] bsg: fix sysfs link remove warning Willy Tarreau
2012-03-12 0:20 ` [ 05/12] eCryptfs: Handle failed metadata read in lookup Willy Tarreau
2012-03-12 0:20 ` [ 06/12] [S390] KEYS: Enable the compat keyctl wrapper on s390x Willy Tarreau
2012-03-12 0:20 ` [ 07/12] cifs: fix dentry refcount leak when opening a FIFO on lookup Willy Tarreau
2012-03-12 0:20 ` [ 08/12] mac80211: zero initialize count field in ieee80211_tx_rate Willy Tarreau
2012-03-12 1:57 ` Ben Hutchings
2012-03-12 4:36 ` Mohammed Shafi Shajakhan
2012-03-12 6:34 ` Willy Tarreau
2012-03-12 6:52 ` Mohammed Shafi Shajakhan
2012-03-12 15:23 ` Ben Hutchings
2012-03-12 15:55 ` Mohammed Shafi Shajakhan
2012-03-12 16:10 ` Mohammed Shafi Shajakhan
2012-03-12 6:31 ` Willy Tarreau
2012-03-12 0:20 ` [ 09/12] net/usbnet: avoid recursive locking in usbnet_stop() Willy Tarreau
2012-03-12 0:20 ` [ 10/12] regset: Prevent null pointer reference on readonly regsets Willy Tarreau
2012-03-12 0:20 ` [ 11/12] regset: Return -EFAULT, not -EIO, on host-side memory fault Willy Tarreau
2012-03-12 0:20 ` [ 12/12] watchdog: hpwdt: clean up set_memory_x call for 32 bit Willy Tarreau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vsjhcuz18.fsf_-_@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=ben@decadent.org.uk \
--cc=git@vger.kernel.org \
--cc=greg@kroah.com \
--cc=jrnieder@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=trast@student.ethz.ch \
--cc=w@1wt.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®