Merge pull request #3 from Crackerz/master

William Blankenship · William Blankenship · commit 4940af747b47 · 2014-02-12T23:44:01.000-05:00
50311bb
diff --git a/git.js b/git.js
@@ -22,7 +22,7 @@ exports.maintainRepo = function (dir,url,callback) {
 	//TODO: Handle errors for git. May not have permission for the specified directory
 	var child = exec('git init '+dir, function(error, stdout,stderr) {
 		var child = exec('git -C "'+dir+'" remote add origin '+url,function(error,stdout,stderr) {
-			var child = exec('git -C "'+dir+'" reset --hard && git -C "'+dir+'" pull origin master',function(error,stdout,stderr) {
+			var child = exec('git --git-dir="'+dir+'/.git" --work-tree="'+dir+'" reset --hard && git --git-dir="'+dir+'/.git" --work-tree="'+dir+'" pull origin master',function(error,stdout,stderr) {
 				if(!execResult(error,stdout,stderr)) {
 					console.log('exec error: '+error);
 				}

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ exports.maintainRepo = function (dir,url,callback) {`
`22`	`22`	`//TODO: Handle errors for git. May not have permission for the specified directory`
`23`	`23`	`var child = exec('git init '+dir, function(error, stdout,stderr) {`
`24`	`24`	`var child = exec('git -C "'+dir+'" remote add origin '+url,function(error,stdout,stderr) {`
`25`		`- var child = exec('git -C "'+dir+'" reset --hard && git -C "'+dir+'" pull origin master',function(error,stdout,stderr) {`
	`25`	`+ var child = exec('git --git-dir="'+dir+'/.git" --work-tree="'+dir+'" reset --hard && git --git-dir="'+dir+'/.git" --work-tree="'+dir+'" pull origin master',function(error,stdout,stderr) {`
`26`	`26`	`if(!execResult(error,stdout,stderr)) {`
`27`	`27`	`console.log('exec error: '+error);`
`28`	`28`	`}`