Merge "jiri: Rename -remotebranch to -remote-branch for consistency."
diff --git a/doc.go b/doc.go
index 5948cf8..7cc6469 100644
--- a/doc.go
+++ b/doc.go
@@ -255,7 +255,7 @@
Path to store the manifest project locally. Uses "manifest" if unspecified.
-protocol=git
The version control protocol used by the remote manifest project.
- -remotebranch=master
+ -remote-branch=master
The branch of the remote manifest project to track.
-revision=HEAD
The revision of the remote manifest project to reset to during "jiri update".
diff --git a/import.go b/import.go
index a7dbb2c..0463e8c 100644
--- a/import.go
+++ b/import.go
@@ -28,7 +28,7 @@
cmdImport.Flags.StringVar(&flagImportName, "name", "", `The name of the remote manifest project, used to disambiguate manifest projects with the same remote. Typically empty.`)
cmdImport.Flags.StringVar(&flagImportPath, "path", "", `Path to store the manifest project locally. Uses "manifest" if unspecified.`)
cmdImport.Flags.StringVar(&flagImportProtocol, "protocol", "git", `The version control protocol used by the remote manifest project.`)
- cmdImport.Flags.StringVar(&flagImportRemoteBranch, "remotebranch", "master", `The branch of the remote manifest project to track.`)
+ cmdImport.Flags.StringVar(&flagImportRemoteBranch, "remote-branch", "master", `The branch of the remote manifest project to track.`)
cmdImport.Flags.StringVar(&flagImportRevision, "revision", "HEAD", `The revision of the remote manifest project to reset to during "jiri update".`)
cmdImport.Flags.StringVar(&flagImportRoot, "root", "", `Root to store the manifest project locally.`)
diff --git a/import_test.go b/import_test.go
index 6f2a4de..d1ae209 100644
--- a/import_test.go
+++ b/import_test.go
@@ -77,7 +77,7 @@
},
// Remote imports, default append behavior
{
- Args: []string{"-name=name", "-path=path", "-remotebranch=remotebranch", "-revision=revision", "-root=root", "foo", "https://github.com/new.git"},
+ Args: []string{"-name=name", "-path=path", "-remote-branch=remotebranch", "-revision=revision", "-root=root", "foo", "https://github.com/new.git"},
Want: `<manifest>
<imports>
<import manifest="foo" root="root" name="name" path="path" remote="https://github.com/new.git" remotebranch="remotebranch" revision="revision"/>
