Commit 3f495f67 authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

replace: refactor command-mode determination

The git-replace command has three modes: listing, deleting,
and replacing. The first two are selected explicitly. If
none is selected, we fallback to listing when there are no
arguments, and replacing otherwise.

Let's figure out up front which operation we are going to
do, before getting into the application logic. That lets us
simplify our option checks (e.g., we currently have to check
whether a useless "--force" is given both along with an
explicit list, as well as with an implicit one).

This saves some lines, makes the logic easier to follow, and
will facilitate further cleanups.
Signed-off-by: default avatarJeff King <peff@peff.net>
Signed-off-by: Christian Couder's avatarChristian Couder <chriscool@tuxfamily.org>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent d8779e1e
......@@ -182,12 +182,16 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0);
if (!list && !delete)
if (!argc)
list = 1;
if (list && delete)
usage_msg_opt("-l and -d cannot be used together",
git_replace_usage, options);
if (format && delete)
usage_msg_opt("--format and -d cannot be used together",
if (format && !list)
usage_msg_opt("--format cannot be used when not listing",
git_replace_usage, options);
if (force && (list || delete))
......@@ -207,9 +211,6 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
if (argc != 2)
usage_msg_opt("bad number of arguments",
git_replace_usage, options);
if (format)
usage_msg_opt("--format cannot be used when not listing",
git_replace_usage, options);
return replace_object(argv[0], argv[1], force);
}
......@@ -217,9 +218,6 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
if (argc > 1)
usage_msg_opt("only one pattern can be given with -l",
git_replace_usage, options);
if (force)
usage_msg_opt("-f needs some arguments",
git_replace_usage, options);
return list_replace_refs(argv[0], format);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment