Commits

Jakob Skjerning  committed 1549a80 Merge with conflicts

Merge remote branch 'abronte/master'

Conflicts:
app/controllers/github_hook_controller.rb

  • Participants
  • Parent commits b2831c8, 416f475

Comments (0)

Files changed (1)

File app/controllers/github_hook_controller.rb

     raise TypeError, "Repository for project '#{identifier}' is not a Git repository" unless repository.is_a?(Repository::Git)
 
     # Get updates from the Github repository
-    command = "cd '#{repository.url}' && cd .. && git pull --rebase"
+    #command = "cd '#{repository.url}' && cd .. && git pull --rebase"
+    command = "cd '#{repository.url}' && git fetch origin && git reset --soft refs/remotes/origin/master"
     exec(command)
 
     # Fetch the new changesets into Redmine