[PATCH v3 1/2] builtin/remote.c: parse options in 'rename'
From: Taylor Blau <hidden>
Date: 2022-03-03 22:25:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Taylor Blau <hidden>
Date: 2022-03-03 22:25:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
The 'git remote rename' command doesn't currently take any command-line
arguments besides the existing and new name of a remote, and so has no
need to call parse_options().
But the subsequent patch will add a `--[no-]progress` option, in which
case we will need to call parse_options().
Do so now so as to avoid cluttering the following patch with noise, like
adjusting setting `rename.{old,new}_name` to argv[0] and argv[1], since
parse_options handles advancing argv past the name of the sub-command.
Signed-off-by: Taylor Blau <redacted>
---
builtin/remote.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c
index 6f27ddc47b..824fb8099c 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c@@ -684,11 +684,14 @@ static int mv(int argc, const char **argv) struct rename_info rename; int i, refspec_updated = 0; - if (argc != 3) + argc = parse_options(argc, argv, NULL, options, + builtin_remote_rename_usage, 0); + + if (argc != 2) usage_with_options(builtin_remote_rename_usage, options); - rename.old_name = argv[1]; - rename.new_name = argv[2]; + rename.old_name = argv[0]; + rename.new_name = argv[1]; rename.remote_branches = &remote_branches; oldremote = remote_get(rename.old_name);
--
2.35.1.73.gccc5557600