fix maintenance problem when changes are only on remote #201
Conversation
| gitium_enable_maintenance_mode() or wp_die( __( 'Could not enable the maintenance mode!', 'gitium' ) ); | ||
|
|
||
| // Check if the local repository is behind the remote | ||
| $behind_commits = $this->git->get_behind_commits(); |
There was a problem hiding this comment.
get_behind_commits runs git rev-list which comparse only commits that exists localy. In order to check comits on remote you have to run a git fetch first, there is a function that I think does that fetch_ref().
There was a problem hiding this comment.
You can inspire from gitium_merge_and_push function and call merge_with_accept_mine but there is a lock that it should be aquired. You can try caling gitium_merge_and_push directly.
There was a problem hiding this comment.
Now I see that gitium_merge_and_push is called below at line 143.
What is then issue that you try to fix? Do you have some STR, or maybe some errors messages ?
Maybe only calling gitium_disable_maintenace_mode is enough?
I see that this function save_changes only when Save changes button is pressed? Where problems with this?
| return; | ||
| } | ||
|
|
||
| // Add all changes in the working directory | ||
| $this->git->add(); |
There was a problem hiding this comment.
| $this->git->add(); | |
| if ($this->add() == 0) { | |
| gitium_disable_maintenance_mode(); | |
| $this->success_redirect( __( 'No changes to commit, repository is up-to-date.', 'gitium' ) ); | |
| return; | |
| } |
No description provided.