Re: [PATCH v4 42/44] builtin-am: implement legacy -b/--binary option

On Thu, Jul 9, 2015 at 5:17 PM, Erik Faye-Lund [off-list ref] wrote:

On Jun 29, 2015 10:06 PM, "Stefan Beller" [off-list ref] wrote:

quoted

On Sun, Jun 28, 2015 at 7:06 AM, Paul Tan [off-list ref] wrote:

quoted

The -b/--binary option was initially implemented in 087b674 (git-am:
--binary; document --resume and --binary., 2005-11-16). The option will
pass the --binary flag to git-apply to allow it to apply binary patches.

However, in 2b6eef9 (Make apply --binary a no-op., 2006-09-06), --binary
was been made a no-op in git-apply. Following that, since cb3a160
(git-am: ignore --binary option, 2008-08-09), the --binary option in
git-am is ignored as well.

In 6c15a1c (am: officially deprecate -b/--binary option, 2012-03-13),
the --binary option was tweaked to its present behavior: when set, the
message:

        The -b/--binary option has been a no-op for long time, and it
        will be removed. Please do not use it anymore.

will be printed.

I wonder if now would be the right time? The rewrite aim's at full
feature compatibility, but we may want to revert this commit on
top of patch 44 later.

I would just remove the deprecated hack from the old implementation in the
beginning of the series.

Junio, what do you think?

Regards,
Paul