From e9f57332cc098e803bf0b357598b47cf08633f02 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Wed, 13 Oct 2021 16:13:48 -0700 Subject: [PATCH] cli: rename `jj git refresh` to `jj git import` I've been planning to add a command for exporting refs to the backing Git repo, so `jj git import` and `jj git export` seem like obvious names then. --- src/commands.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/commands.rs b/src/commands.rs index 4c8b759d7..97a83de77 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -1149,7 +1149,7 @@ By default, all branches are pushed. Use `--branch` if you want to push only one ), ) .subcommand( - SubCommand::with_name("refresh") + SubCommand::with_name("import") .about("Update repo with changes made in the underlying Git repo"), ); let bench_command = SubCommand::with_name("bench") @@ -3611,7 +3611,7 @@ fn cmd_git_push( Ok(()) } -fn cmd_git_refresh( +fn cmd_git_import( ui: &mut Ui, command: &CommandHelper, _git_matches: &ArgMatches, @@ -3640,8 +3640,8 @@ fn cmd_git( cmd_git_clone(ui, command, sub_matches, command_matches)?; } else if let Some(command_matches) = sub_matches.subcommand_matches("push") { cmd_git_push(ui, command, sub_matches, command_matches)?; - } else if let Some(command_matches) = sub_matches.subcommand_matches("refresh") { - cmd_git_refresh(ui, command, sub_matches, command_matches)?; + } else if let Some(command_matches) = sub_matches.subcommand_matches("import") { + cmd_git_import(ui, command, sub_matches, command_matches)?; } else { panic!("unhandled command: {:#?}", command.root_matches()); }