diff options
| author | Ereth McKnight-MacNeil <ereth@google.com> | 2018-12-19 21:28:35 -0800 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2018-12-20 19:55:02 +0000 |
| commit | 12ee5446e9eb8b9d0ae5425fb1e00bf05f93facd (patch) | |
| tree | 5402f6580677be040bcd757104fa1e8f2110f8cb | |
| parent | e158e3802da077ff1d6dad41165d9f51a560886c (diff) | |
| download | git-repo-12ee5446e9eb8b9d0ae5425fb1e00bf05f93facd.tar.gz | |
init: Remove -c short option for --current-branchv1.13.1
This option conflicts with the gitc-init -c short option.
Bug: https://crbug.com/gerrit/10200
Change-Id: I06f37564429ca0bd4c0bbea6066daae4f663c838
| -rwxr-xr-x | repo | 4 | ||||
| -rw-r--r-- | subcmds/init.py | 2 |
2 files changed, 3 insertions, 3 deletions
| @@ -23,7 +23,7 @@ REPO_REV = 'stable' | |||
| 23 | # limitations under the License. | 23 | # limitations under the License. |
| 24 | 24 | ||
| 25 | # increment this whenever we make important changes to this script | 25 | # increment this whenever we make important changes to this script |
| 26 | VERSION = (1, 24) | 26 | VERSION = (1, 25) |
| 27 | 27 | ||
| 28 | # increment this if the MAINTAINER_KEYS block is modified | 28 | # increment this if the MAINTAINER_KEYS block is modified |
| 29 | KEYRING_VERSION = (1, 2) | 29 | KEYRING_VERSION = (1, 2) |
| @@ -183,7 +183,7 @@ group.add_option('-b', '--manifest-branch', | |||
| 183 | group.add_option('-m', '--manifest-name', | 183 | group.add_option('-m', '--manifest-name', |
| 184 | dest='manifest_name', | 184 | dest='manifest_name', |
| 185 | help='initial manifest file', metavar='NAME.xml') | 185 | help='initial manifest file', metavar='NAME.xml') |
| 186 | group.add_option('-c', '--current-branch', | 186 | group.add_option('--current-branch', |
| 187 | dest='current_branch_only', action='store_true', | 187 | dest='current_branch_only', action='store_true', |
| 188 | help='fetch only current manifest branch from server') | 188 | help='fetch only current manifest branch from server') |
| 189 | group.add_option('--mirror', | 189 | 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. | |||
| 95 | g.add_option('-b', '--manifest-branch', | 95 | g.add_option('-b', '--manifest-branch', |
| 96 | dest='manifest_branch', | 96 | dest='manifest_branch', |
| 97 | help='manifest branch or revision', metavar='REVISION') | 97 | help='manifest branch or revision', metavar='REVISION') |
| 98 | g.add_option('-c', '--current-branch', | 98 | g.add_option('--current-branch', |
| 99 | dest='current_branch_only', action='store_true', | 99 | dest='current_branch_only', action='store_true', |
| 100 | help='fetch only current manifest branch from server') | 100 | help='fetch only current manifest branch from server') |
| 101 | g.add_option('-m', '--manifest-name', | 101 | g.add_option('-m', '--manifest-name', |
