summaryrefslogtreecommitdiffstats
path: root/subcmds/init.py
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2009-03-19 10:17:12 -0700
committerShawn O. Pearce <sop@google.com>2009-03-19 10:17:12 -0700
commit8630f39dba4de00345c130e34e98859df169c97a (patch)
treec2631975b9977e02004647f1c740974db82aafe8 /subcmds/init.py
parentdf01883f9b09adcd13f42971a102812f1148408e (diff)
downloadgit-repo-8630f39dba4de00345c130e34e98859df169c97a.tar.gz
Fix repo re-init in a mirror to not prompt
On a mirror client we don't prompt for user.name,user.email as the data is only necessary if you will make new commits. On a re-init we were testing the command line option, not the existing IsMirror property from the manifest configuration file. Signed-off-by: Shawn O. Pearce <sop@google.com>
Diffstat (limited to 'subcmds/init.py')
-rw-r--r--subcmds/init.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/subcmds/init.py b/subcmds/init.py
index 83ed2b62..d86c49ae 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -202,11 +202,11 @@ default.xml will be used.
202 self._SyncManifest(opt) 202 self._SyncManifest(opt)
203 self._LinkManifest(opt.manifest_name) 203 self._LinkManifest(opt.manifest_name)
204 204
205 if os.isatty(0) and os.isatty(1) and not opt.mirror: 205 if os.isatty(0) and os.isatty(1) and not self.manifest.IsMirror:
206 self._ConfigureUser() 206 self._ConfigureUser()
207 self._ConfigureColor() 207 self._ConfigureColor()
208 208
209 if opt.mirror: 209 if self.manifest.IsMirror:
210 type = 'mirror ' 210 type = 'mirror '
211 else: 211 else:
212 type = '' 212 type = ''