fix(create): fix force git init

yyx990803 · yyx990803 · commit 967f99abc0b2 · 2018-07-20T10:33:18.000-04:00
diff --git a/packages/@vue/cli/bin/vue.js b/packages/@vue/cli/bin/vue.js
@@ -49,13 +49,18 @@ program
   .option('-i, --inlinePreset <json>', 'Skip prompts and use inline JSON string as preset')
   .option('-m, --packageManager <command>', 'Use specified npm client when installing dependencies')
   .option('-r, --registry <url>', 'Use specified npm registry when installing dependencies (only for npm)')
-  .option('-g, --git [message]', 'Force git initialization with optional initial commit message')
+  .option('-g, --git [message]', 'Force git initialization with initial commit message')
   .option('-n, --no-git', 'Skip git initialization')
   .option('-f, --force', 'Overwrite target directory if it exists')
   .option('-c, --clone', 'Use git clone when fetching remote preset')
   .option('-x, --proxy', 'Use specified proxy when creating project')
   .action((name, cmd) => {
-    require('../lib/create')(name, cleanArgs(cmd))
+    const options = cleanArgs(cmd)
+    // --no-git makes commander to default git to true
+    if (process.argv.includes('-g') || process.argv.includes('--git')) {
+      options.forceGit = true
+    }
+    require('../lib/create')(name, options)
   })
 
 program
diff --git a/packages/@vue/cli/lib/Creator.js b/packages/@vue/cli/lib/Creator.js
@@ -440,10 +440,15 @@ module.exports = class Creator extends EventEmitter {
     if (!hasGit()) {
       return false
     }
-    if (typeof cliOptions.git !== 'undefined') {
-      return cliOptions.git !== 'false' && cliOptions.git !== false
+    // --git
+    if (cliOptions.forceGit) {
+      return true
     }
-
+    // --no-git
+    if (cliOptions.git === false || cliOptions.git === 'false') {
+      return false
+    }
+    // default: true unless already in a git repo
     return !hasProjectGit(this.context)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -440,10 +440,15 @@ module.exports = class Creator extends EventEmitter {`
`440`	`440`	`if (!hasGit()) {`
`441`	`441`	`return false`
`442`	`442`	`}`
`443`		`- if (typeof cliOptions.git !== 'undefined') {`
`444`		`- return cliOptions.git !== 'false' && cliOptions.git !== false`
	`443`	`+ // --git`
	`444`	`+ if (cliOptions.forceGit) {`
	`445`	`+ return true`
`445`	`446`	`}`
`446`		`-`
	`447`	`+ // --no-git`
	`448`	`+ if (cliOptions.git === false \|\| cliOptions.git === 'false') {`
	`449`	`+ return false`
	`450`	`+ }`
	`451`	`+ // default: true unless already in a git repo`
`447`	`452`	`return !hasProjectGit(this.context)`
`448`	`453`	`}`
`449`	`454`	`}`