commit 12ee5446e9eb8b9d0ae5425fb1e00bf05f93facd
author Ereth McKnight-MacNeil <ereth@google.com> Wed Dec 19 21:28:35 2018 -0800
committer Jonathan Nieder <jrn@google.com> Thu Dec 20 19:55:02 2018 +0000
tree 5402f6580677be040bcd757104fa1e8f2110f8cb
parent e158e3802da077ff1d6dad41165d9f51a560886c

init: Remove -c short option for --current-branch

This option conflicts with the gitc-init -c short option.

Bug: https://crbug.com/gerrit/10200
Change-Id: I06f37564429ca0bd4c0bbea6066daae4f663c838

repo

diff --git a/repo b/repo
index 7ffa770..f251a1d 100755
--- a/repo
+++ b/repo
@@ -23,7 +23,7 @@
 # limitations under the License.
 
 # increment this whenever we make important changes to this script
-VERSION = (1, 24)
+VERSION = (1, 25)
 
 # increment this if the MAINTAINER_KEYS block is modified
 KEYRING_VERSION = (1, 2)
@@ -183,7 +183,7 @@
 group.add_option('-m', '--manifest-name',
                  dest='manifest_name',
                  help='initial manifest file', metavar='NAME.xml')
-group.add_option('-c', '--current-branch',
+group.add_option('--current-branch',
                  dest='current_branch_only', action='store_true',
                  help='fetch only current manifest branch from server')
 group.add_option('--mirror',

subcmds/init.py

diff --git a/subcmds/init.py b/subcmds/init.py
index 6e99658..9a9e849 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -95,7 +95,7 @@
     g.add_option('-b', '--manifest-branch',
                  dest='manifest_branch',
                  help='manifest branch or revision', metavar='REVISION')
-    g.add_option('-c', '--current-branch',
+    g.add_option('--current-branch',
                  dest='current_branch_only', action='store_true',
                  help='fetch only current manifest branch from server')
     g.add_option('-m', '--manifest-name',