From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 13 Mar 2012 12:51:58 -0500 From: Jonathan Nieder To: Junio C Hamano Cc: Thomas Rast , Willy Tarreau , Greg KH , Ben Hutchings , linux-kernel@vger.kernel.org, stable@vger.kernel.org, git@vger.kernel.org Subject: Re: [PATCH] git-am: error out when seeing -b/--binary Message-ID: <20120313175158.GA6653@burratino> References: <20120312152453.GB12405@1wt.eu> <87aa3l4vqq.fsf@thomas.inf.ethz.ch> <20120312165703.GB18791@burratino> <7vvcm9snko.fsf@alter.siamese.dyndns.org> <87399dpk48.fsf@thomas.inf.ethz.ch> <20120312215607.GB11362@burratino> <874ntto4t8.fsf@thomas.inf.ethz.ch> <20120312222227.GC11362@burratino> <87fwdcldqj.fsf@thomas.inf.ethz.ch> <7v62e8la9y.fsf@alter.siamese.dyndns.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7v62e8la9y.fsf@alter.siamese.dyndns.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: Junio C Hamano wrote: > I really don't think it is a good idea to avoid mentioning 1.6.0, at > which we *removed* description of the option in our manual pages and > from the "git am -h" help message. How much more active deprecation > would a user want? A warning when the option is used or a mention in the release notes. > To put it another way, think what your answer would be when somebody > sees the message and says "eh? all of a sudden it was removed?". > Wouldn't you tell him "At 1.6.0 we deprecated it and stopped > advertising it"? Why not give that answer upfront? I would tell her "Since 1.4.3 it has been a compatibility no-op and our documentation made that clear, and by now based on a search nobody seems to be using it". What happened in 1.6.0, then? Well, before 1.6.0, the git-am(1) manual said -b, --binary Pass --allow-binary-replacement flag to git-apply (see git-apply(1)). and the git-apply(1) manual said --allow-binary-replacement, --binary Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so. Currently we always allow binary patch application, so this is a no-op. Afterwards, the entry in the git-am(1) manual was removed, saving the reader a little time. Jonathan