undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/remote.c: parse options in 'rename'

Browse Source 
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 <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau 2022-03-03 17:25:16 -05:00 committed by Junio C Hamano
parent 715d08a9e5
commit c6dddb34b5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/remote.c
View File

@ -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);