reset && checkout => reset --hard

xiaozhuaisnow · Nov 17, 2015 · 5331835 · 5331835
1 parent a710f85
commit 5331835
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/components/Git.php b/components/Git.php
@@ -47,8 +47,7 @@ public function updateToVersion($task) {
  $destination = Project::getDeployWorkspace($task->link_id);
  $this->updateRepo($task->branch, $destination);
  $cmd[] = sprintf('cd %s ', $destination);
- $cmd[] = sprintf('/usr/bin/env git reset -q %s', $task->commit_id);
- $cmd[] = '/usr/bin/env git checkout -q .';
+ $cmd[] = sprintf('/usr/bin/env git reset -q --hard %s', $task->commit_id);
  $command = join(' && ', $cmd);
 
  return $this->runLocalCommand($command);