Unable to pop stash after upgrading; production config lost
Created by: slhck
I tried to run git stash pop
after the upgrade from 6.5.1 to 6.6.0 but I'm getting:
unable to refresh index
Which means the changes to my config/environments/production.rb
were lost during the upgrade or something else went wrong.
Here are the relevant logs:
Shutting down both Unicorn and Sidekiq.
GitLab is not running.
werner@git /home/git/gitlab [6f6f158 *] % cd /home/git/gitlab
werner@git /home/git/gitlab [6f6f158 *] % sudo -u git -H ruby script/upgrade.rb
werner@git /home/git/gitlab [6f6f158 *] % git status
# HEAD detached at v6.5.1
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: config/environments/production.rb
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# public/assets/
#
no changes added to commit (use "git add" and/or "git commit -a")
werner@git /home/git/gitlab [6f6f158 *] % sudo -u git -H ruby script/upgrade.rb
GitLab 6 upgrade tool
Your version is 6.5.1
Latest available version for GitLab 6 is 6.6.0
Newer GitLab version is available
Do you want to upgrade (yes/no)? yes
Stash changed files
-> git stash
Saved working directory and index state WIP on (no branch): 6f6f158 Version 6.5.1
HEAD is now at 6f6f158 Version 6.5.1
-> OK
Get latest code
-> git fetch
remote: Counting objects: 3118, done.
remote: Compressing objects: 100% (1571/1571), done.
remote: Total 3118 (delta 1906), reused 2337 (delta 1497)
Receiving objects: 100% (3118/3118), 27.79 MiB | 2.30 MiB/s, done.
Resolving deltas: 100% (1906/1906), done.
From https://github.com/gitlabhq/gitlabhq
6f6f158..2ffa03a 6-5-stable -> origin/6-5-stable
* [new branch] 6-6-stable -> origin/6-6-stable
2adbc0b..71e7bff master -> origin/master
* [new tag] v6.6.0 -> v6.6.0
From https://github.com/gitlabhq/gitlabhq
* [new tag] v6.6.0.pre1 -> v6.6.0.pre1
* [new tag] v6.6.0.rc1 -> v6.6.0.rc1
-> OK
Switch to new version
-> git checkout v6.6.0
Previous HEAD position was 6f6f158... Version 6.5.1
HEAD is now at 490f99d... New stable branches and update guide
-> OK
Install gems
-> bundle
Fetching source index from https://rubygems.org/
Installing rake (10.1.1)
Installing ace-rails-ap (2.0.1)
Using i18n (0.6.9)
....
Clear cache
-> bundle exec rake cache:clear RAILS_ENV=production
-> OK
Done
werner@git /home/git/gitlab [490f99d] % git stash pop
unable to refresh index