diff --git a/cmd/tailscale/cli/cli_test.go b/cmd/tailscale/cli/cli_test.go index fd1bd4891..7f00539e5 100644 --- a/cmd/tailscale/cli/cli_test.go +++ b/cmd/tailscale/cli/cli_test.go @@ -786,6 +786,16 @@ func TestUpdatePrefs(t *testing.T) { wantSimpleUp: true, wantJustEditMP: &ipn.MaskedPrefs{WantRunningSet: true}, }, + { + name: "just_edit_reset", + flags: []string{"--reset"}, + curPrefs: &ipn.Prefs{ + ControlURL: ipn.DefaultControlURL, + Persist: &persist.Persist{LoginName: "crawshaw.github"}, + }, + env: upCheckEnv{backendState: "Running"}, + wantJustEditMP: &ipn.MaskedPrefs{WantRunningSet: true}, + }, { name: "control_synonym", flags: []string{}, diff --git a/cmd/tailscale/cli/up.go b/cmd/tailscale/cli/up.go index d82fe68e3..77ea399d5 100644 --- a/cmd/tailscale/cli/up.go +++ b/cmd/tailscale/cli/up.go @@ -413,7 +413,6 @@ func updatePrefs(prefs, curPrefs *ipn.Prefs, env upCheckEnv) (simpleUp bool, jus justEdit := env.backendState == ipn.Running.String() && !env.upArgs.forceReauth && - !env.upArgs.reset && env.upArgs.authKeyOrFile == "" && !controlURLChanged && !tagsChanged