Question

尝试使用capistrano部署到我的远程服务器时，我一直收到错误消息。它告诉我我的本地文件没有同步到远程仓库，但是当我git push时，我收到了Everything is up-to-date消息。我不确定问题是什么。我还检查了原点和HEAD的rev-parse，它们返回相同的值。

错误：

WARNING: HEAD is not the same as origin/master
Run `git push` to sync changes.
(Backtrace restricted to imported tasks)
cap aborted!
SSHKit::Runner::ExecuteError: Exception while executing on host [IP address]
exit

SystemExit: exit

Tasks: TOP => deploy:starting => deploy:check_revision
(See full trace by running task with --trace)
The deploy has failed with an error: Exception while executing on host [IP address]: exit

deploy.rb

# Change these
server '[ipaddress]', port: 22, roles: [:web, :app, :db], primary: true

set :repo_url,        'git@github.com:name/rails_site.git'
set :application,     'rails_site'
set :user,            'deploy'
set :puma_threads,    [4, 16]
set :puma_workers,    0

# Don't change these unless you know what you're doing
set :pty,             true
set :use_sudo,        false
set :stage,           :production
set :deploy_via,      :remote_cache
set :deploy_to,       "/home/#{fetch(:user)}/apps/#{fetch(:application)}"
set :puma_bind,       "unix://#{shared_path}/tmp/sockets/#{fetch(:application)}-puma.sock"
set :puma_state,      "#{shared_path}/tmp/pids/puma.state"
set :puma_pid,        "#{shared_path}/tmp/pids/puma.pid"
set :puma_access_log, "#{release_path}/log/puma.error.log"
set :puma_error_log,  "#{release_path}/log/puma.access.log"
set :ssh_options,     { forward_agent: true, user: fetch(:user), keys: %w(~/.ssh/id_rsa.pub) }
set :puma_preload_app, true
set :puma_worker_timeout, nil
set :puma_init_active_record, true  # Change to false when not using ActiveRecord

## Defaults:
 set :scm,           :git
 set :branch,        :master
 set :format,        :pretty
 set :log_level,     :debug
 set :keep_releases, 5

## Linked Files & Directories (Default None):
# set :linked_files, %w{config/database.yml}
# set :linked_dirs,  %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}

namespace :puma do
  desc 'Create Directories for Puma Pids and Socket'
  task :make_dirs do
    on roles(:app) do
      execute "mkdir #{shared_path}/tmp/sockets -p"
      execute "mkdir #{shared_path}/tmp/pids -p"
    end
  end

  before :start, :make_dirs
end

namespace :deploy do
  desc "Make sure local git is in sync with remote."
  task :check_revision do
    on roles(:app) do
      unless 'git rev-parse HEAD' === 'git rev-parse origin/master'
        puts "WARNING: HEAD is not the same as origin/master"
        puts "Run `git push` to sync changes."
        exit
      end
    end
  end

  desc 'Initial Deploy'
  task :initial do
    on roles(:app) do
      before 'deploy:restart', 'puma:start'
      invoke 'deploy'
    end
  end

  desc 'Restart application'
  task :restart do
    on roles(:app), in: :sequence, wait: 5 do
      invoke 'puma:restart'
    end
  end

  before :starting,     :check_revision
  after  :finishing,    :compile_assets
  after  :finishing,    :cleanup
  after  :finishing,    :restart
end

# ps aux | grep puma    # Get puma pid
# kill -s SIGUSR2 pid   # Restart puma
# kill -s SIGTERM pid   # Stop puma

编辑：

$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean

$ git branch -a
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master

Answer 1

我不知道你为什么写这个：

unless 'git rev-parse HEAD' === 'git rev-parse origin/master'

而不是：

unless `git rev-parse HEAD` === `git rev-parse origin/master`

如果是拼写错误，我会删除此答案。如果没有，则表示您正在比较字符串而不是命令结果。

你也可以使用：

unless %x{git rev-parse HEAD} === %x{git rev-parse origin/master}

在method ` definition了解详情。另外我更喜欢使用==而不是===（但是对于字符串是相同的）。

Answer 2

好的，我有一个适合你的解决方案。我已经在我的机器上测试了它的工作原理。请注意，这感觉就像一个黑客，可能不是最有效的答案。然而，它有效。

按照以下步骤删除现有项目，克隆新项目，并将本地项目与git中的内容合并：

# back out of your project
cd ..

# delete your project
sudo rm -r yourproject

# clone fresh instance of your project
git clone https://github.com/yourusername/yourproject.git

# navigate to your project
cd yourproject

# remove .git folder
sudo rm -r .git

# initialize a new .git
git init

# add all files for upcoming commit/merge
git add .

# set commit
git commit -m "refreshed sync"

# set remote origin to merge with
git remote add origin https://github.com/yourusername/yourproject.git

# make a pull to merge the two
# you will enter a nano screen to enter comment
# press CTRL + X to continue
git pull https://github.com/yourusername/yourproject.git

# push to remote location and set upstream
git push --set-upstream origin master

# Now you're all set!

Answer 3

使用git branch检查您是否在不同的分支机构。如果您的服务器使用主分支，则git checkout master git push解决了我的问题。

Answer 4

在您的deploy.rb中，暂时注释before :starting, :check_revision，然后部署而不提交此更改。

无法使用rails和capistrano进行部署，“HEAD与origin / master不同”

4 个答案: