@matheusbsbs / matheus-bagliano / commits / c2676cde9f

builtin-am: implement legacy -b/--binary option

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. Re-implement this in builtin/am.c. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Paul Tan committed Aug 4, 2015 at 21:52 UTC c2676cde9f2c2a67b3860f7fc69e4dc8597e505f
1 file changed +7
builtin/am.c
+7
@@ -2126,6 +2126,7 @@ enum resume_mode {
2126 int cmd_am(int argc, const char **argv, const char *prefix)
2127 {
2128 struct am_state state;
2129 + int binary = -1;
2130 int keep_cr = -1;
2131 int patch_format = PATCH_FORMAT_UNKNOWN;
2132 enum resume_mode resume = RESUME_FALSE;
@@ -2139,6 +2140,8 @@ int cmd_am(int argc, const char **argv, const char *prefix)
2140 struct option options[] = {
2141 OPT_BOOL('i', "interactive", &state.interactive,
2142 N_("run interactively")),
2143 + OPT_HIDDEN_BOOL('b', "binary", &binary,
2144 + N_("(historical option -- no-op")),
2145 OPT_BOOL('3', "3way", &state.threeway,
2146 N_("allow fall back on 3way merging if needed")),
2147 OPT__QUIET(&state.quiet, N_("be quiet")),
@@ -2239,6 +2242,10 @@ int cmd_am(int argc, const char **argv, const char *prefix)
2242
2243 argc = parse_options(argc, argv, prefix, options, usage, 0);
2244
2245 + if (binary >= 0)
2246 + fprintf_ln(stderr, _("The -b/--binary option has been a no-op for long time, and\n"
2247 + "it will be removed. Please do not use it anymore."));
2248 +
2249 if (read_index_preload(&the_index, NULL) < 0)
2250 die(_("failed to read the index"));
2251