From 12ee5446e9eb8b9d0ae5425fb1e00bf05f93facd Mon Sep 17 00:00:00 2001 From: Ereth McKnight-MacNeil Date: Wed, 19 Dec 2018 21:28:35 -0800 Subject: [PATCH] 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 | 4 ++-- subcmds/init.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repo b/repo index 7ffa7705..f251a1da 100755 --- a/repo +++ b/repo @@ -23,7 +23,7 @@ REPO_REV = 'stable' # 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('-b', '--manifest-branch', 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', diff --git a/subcmds/init.py b/subcmds/init.py index 6e99658f..9a9e8499 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -95,7 +95,7 @@ to update the working directory files. 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',