Skip to content

S
srvpro
Commit ed533d64 authored by nanahira's avatar nanahira
Browse files
Options

shrink

parent 3d378be9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
ygopro-webhook.js
View file @ ed533d64
...@@ -57,10 +57,10 @@ var pull_data = function(path, remote, branch, callback) { ...@@ -57,10 +57,10 @@ var pull_data = function(path, remote, branch, callback) {
return; return;
} }
var reset_repo = function(path, remote, branch, callback) { var reset_repo = function(path, callback) {
sendResponse("Started resetting on branch "+branch+" at "+path+" from "+remote+"."); sendResponse("Started resetting at "+path+".");
try { try {
var proc = spawn("git", ["reset", "--hard", remote + "/" + branch], { cwd: path, env: process.env }); var proc = spawn("git", ["reset", "--hard", "FETCH_HEAD"], { cwd: path, env: process.env });
proc.stdout.setEncoding('utf8'); proc.stdout.setEncoding('utf8');
proc.stdout.on('data', function(data) { proc.stdout.on('data', function(data) {
sendResponse("git reset stdout: "+data); sendResponse("git reset stdout: "+data);
...@@ -70,13 +70,13 @@ var reset_repo = function(path, remote, branch, callback) { ...@@ -70,13 +70,13 @@ var reset_repo = function(path, remote, branch, callback) {
sendResponse("git reset stderr: "+data); sendResponse("git reset stderr: "+data);
}); });
proc.on('close', function (code) { proc.on('close', function (code) {
sendResponse("Finished resetting on branch "+branch+" at "+path+" from "+remote+"."); sendResponse("Finished resetting at "+path+".");
if (callback) { if (callback) {
callback(false); callback(false);
} }
}); });
} catch (err) { } catch (err) {
sendResponse("Errored resetting on branch "+branch+" at "+path+" from "+remote+"."); sendResponse("Errored resetting at "+path+".");
if (callback) { if (callback) {
callback(true); callback(true);
} }
...@@ -113,7 +113,7 @@ var run_custom_callback = function(command, args, path, callback) { ...@@ -113,7 +113,7 @@ var run_custom_callback = function(command, args, path, callback) {
var pull_callback = function(name, info) { var pull_callback = function(name, info) {
if (info.forced) { if (info.forced) {
reset_repo(info.path, info.remote, info.branch, function(fail) { reset_repo(info.path, function(fail) {
reset_callback(name, info); reset_callback(name, info);
}); });
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment