Merge pull request vuejs#232 from FadyMak/master

zigomir · web-flow · commit 8aeed5c388eb · 2016-11-13T09:31:49.000-08:00
Escape string in git config user.name
diff --git a/lib/git-user.js b/lib/git-user.js
@@ -9,7 +9,7 @@ module.exports = function () {
     email = exec('git config --get user.email')
   } catch (e) {}
 
-  name = name && name.toString().trim()
+  name = name && JSON.stringify(name.toString().trim()).slice(1, -1)
   email = email && (' <' + email.toString().trim() + '>')
   return (name || '') + (email || '')
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ module.exports = function () {`
`9`	`9`	`email = exec('git config --get user.email')`
`10`	`10`	`} catch (e) {}`
`11`	`11`
`12`		`- name = name && name.toString().trim()`
	`12`	`+ name = name && JSON.stringify(name.toString().trim()).slice(1, -1)`
`13`	`13`	`email = email && (' <' + email.toString().trim() + '>')`
`14`	`14`	`return (name \|\| '') + (email \|\| '')`
`15`	`15`	`}`