Message ID | 20210817064435.97625-2-carenas@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | builtin/add: minor unrelated fixes | expand |
On Mon, Aug 16, 2021 at 11:44:34PM -0700, Carlo Marcelo Arenas Belón wrote: > 90a6bb98d1 (legacy stash -p: respect the add.interactive.usebuiltin > setting, 2019-12-21) adds a hidden option and its supporting code > to support the legacy stash script, but that was left behind when > it was retired. > > mostly revert commit. (Sorry for a much-delayed response, I'm trying to do a little bit of inbox-cleaning ;)). If you're re-rolling based on Dscho's suggestions later on in the series, I'd suggest two changes to make the patch message clearer: - Clarify the antecedent of "it" in "it was retired". I find that "...but that [option] was forgotten about even when [the legacy stash implementation] was retired". - Link to the commit where we dropped support for that implementation (which was in 8a2cd3f512 (stash: remove the stash.useBuiltin setting, 2020-03-03)) to make it clear that that happened after 90a6bb98d1. - Finally "mostly revert commit." should add more detail without being verbose. I'd write: Since 8a2cd3f512 removed the legacy implementation, the changes from 90a6bb98d1 are no longer necessary, so revert them. > @@ -483,6 +480,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) > builtin_add_usage, PARSE_OPT_KEEP_ARGV0); > if (patch_interactive) > add_interactive = 1; > + Stray whitespace change, but the rest of the patch looks good to me. Thanks, Taylor
diff --git a/builtin/add.c b/builtin/add.c index b773b5a499..a15b5be220 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -31,7 +31,6 @@ static int take_worktree_changes; static int add_renormalize; static int pathspec_file_nul; static const char *pathspec_from_file; -static int legacy_stash_p; /* support for the scripted `git stash` */ struct update_callback_data { int flags; @@ -382,8 +381,6 @@ static struct option builtin_add_options[] = { N_("override the executable bit of the listed files")), OPT_HIDDEN_BOOL(0, "warn-embedded-repo", &warn_on_embedded_repo, N_("warn when adding an embedded repository")), - OPT_HIDDEN_BOOL(0, "legacy-stash-p", &legacy_stash_p, - N_("backend for `git stash -p`")), OPT_PATHSPEC_FROM_FILE(&pathspec_from_file), OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul), OPT_END(), @@ -483,6 +480,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) builtin_add_usage, PARSE_OPT_KEEP_ARGV0); if (patch_interactive) add_interactive = 1; + if (add_interactive) { if (show_only) die(_("--dry-run is incompatible with --interactive/--patch")); @@ -490,17 +488,6 @@ int cmd_add(int argc, const char **argv, const char *prefix) die(_("--pathspec-from-file is incompatible with --interactive/--patch")); exit(interactive_add(argv + 1, prefix, patch_interactive)); } - if (legacy_stash_p) { - struct pathspec pathspec; - - parse_pathspec(&pathspec, 0, - PATHSPEC_PREFER_FULL | - PATHSPEC_SYMLINK_LEADING_PATH | - PATHSPEC_PREFIX_ORIGIN, - prefix, argv); - - return run_add_interactive(NULL, "--patch=stash", &pathspec); - } if (edit_interactive) { if (pathspec_from_file)
90a6bb98d1 (legacy stash -p: respect the add.interactive.usebuiltin setting, 2019-12-21) adds a hidden option and its supporting code to support the legacy stash script, but that was left behind when it was retired. mostly revert commit. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> --- builtin/add.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)