summaryrefslogtreecommitdiff
path: root/builtin/replace.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-04-26 20:00:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-29 19:38:32 (GMT)
commit3f495f67bc4ec744ac60f6e7bec0924022670998 (patch)
tree68e3ceba28e34aaf183d72f01b5dabf75bd9259c /builtin/replace.c
parentd8779e1e2536bdd024254af14d2c046bba2bbb01 (diff)
downloadgit-3f495f67bc4ec744ac60f6e7bec0924022670998.zip
git-3f495f67bc4ec744ac60f6e7bec0924022670998.tar.gz
git-3f495f67bc4ec744ac60f6e7bec0924022670998.tar.bz2
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: Jeff King <peff@peff.net> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/replace.c')
-rw-r--r--builtin/replace.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/builtin/replace.c b/builtin/replace.c
index b62420a..28db96f 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -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);
}