Unable to commit in non-default branch from code editor

Created by: lfedon

I am browsing code in a branch that is not the default branch of my project. If I preview the code, then click on edit, the editor allows me to commit on a branch which name is the id of the commit i am browsing.

If i commit some changes however, the branch is not created and my changes seem to be lost

Created by: bbodenmiller

Thanks for the issue report. Please reformat your issue to conform to the issue tracker guidelines found in our contributing guidelines.

By Administrator on 2013-07-03T02:52:55 (imported from GitLab project)

By Administrator on 2013-07-03T02:52:55 (imported from GitLab)

Created by: Razer6

Tested an works for me. Are there error messages through UI or in the logs?

By Administrator on 2013-07-03T10:48:17 (imported from GitLab project)

By Administrator on 2013-07-03T10:48:17 (imported from GitLab)

Created by: lfedon

Steps to reproduce :

1. Open Merge request assigned to me
2. Click on the last commit id (committed by someone else with right Developer)
3. Click on view file (one the file that have been committed in the commit i am browsing) -> at this point the list box at the upper left corner display the id of the commit (which is ok)
4. I click on edit -> I can edit the file, I can put a commit message, but the nex t to the commit button there is "to branch sha1" with sha1 the id of the commit I am browsing, if I click on it nothing happens (no UI error), the file is just reloaded without the changes I have just made.

I have the following error log in the logs (githost.logs)

July 05, 2013 09:39 -> ERROR -> Command failed [128]: /usr/bin/git --git-dir=/mnt/git/gitlab-satellites/runmyprocess/user-guide/.git checkout -b 84f2b88339a438d09d5957bdde5e0ed03c066902 origin/84f2b88339a438d09d5957bdde5e0ed03c066902 fatal: Cannot update paths and switch to branch '84f2b88339a438d09d5957bdde5e0ed03c066902' at the same time. Did you intend to checkout 'origin/84f2b88339a438d09d5957bdde5e0ed03c066902' which can not be resolved as commit?

Version of gitlab is 5.3

---

Check

/mnt/git/gitlab $ sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production Checking Environment ...

Git configured for git user? ... yes Has python2? ... yes python2 is supported version? ... yes

Checking Environment ... Finished

Checking GitLab Shell ...

GitLab Shell version >= 1.4.0 ? ... OK (1.4.0) Repo base directory exists? ... yes Repo base directory is a symlink? ... no Repo base owned by git:git? ... yes Repo base access is drwxrws---? ... yes post-receive hook up-to-date? ... yes post-receive hooks in repos are links: ... RunMyProcess / chef-repo ... ok RunMyProcess / testing ... repository is empty RunMyProcess / beanstalkclient ... ok chef cookbooks / nginx ... ok chef cookbooks / postfix ... ok chef cookbooks / mongodb ... ok RunMyProcess / Documents ... ok RunMyProcess / Thread Manager ... ok RunMyProcess / mongo-java-driver ... ok RunMyProcess / json ... ok RunMyProcess / operations ... ok RunMyProcess / sdk-js ... ok RunMyProcess / deployment ... ok RunMyProcess / data-connector-agent ... ok RunMyProcess / sdc-proxy ... ok RunMyProcess / markdoc ... ok RunMyProcess / Python-Markdown ... ok RunMyProcess / Pygments ... ok chef cookbooks / logstash ... ok RunMyProcess / FGCP ... ok RunMyProcess / RunMyLog ... ok RunMyProcess / RunMyApp ... ok chef cookbooks / chef-percona ... ok RunMyProcess / SAP Protocol Handler ... ok RunMyProcess / Pricing scripts ... ok RunMyProcess / SEC Protocol Manager ... ok RunMyProcess / SEC SDK ... ok RunMyProcess / SEC Generic Protocol Handler ... ok RunMyProcess / User Guide ... ok chef cookbooks / munin ... ok chef cookbooks / monit ... ok RunMyProcess / client ... ok RunMyProcess / application-runner ... ok RunMyProcess / server ... ok Itagaki Yoshinori / FGCP ... ok

Checking GitLab Shell ... Finished

Checking Sidekiq ...

Running? ... yes

Checking Sidekiq ... Finished

Checking GitLab ...

Database config exists? ... yes Database is SQLite ... no All migrations up? ... yes GitLab config exists? ... yes GitLab config outdated? ... no Log directory writable? ... yes Tmp directory writable? ... yes Init script exists? ... yes Init script up-to-date? ... no Try fixing it: Redownload the init script For more information see: doc/install/installation.md in section "Install Init Script" Please fix the error above and rerun the checks. Projects have satellites? ... RunMyProcess / chef-repo ... yes RunMyProcess / testing ... yes RunMyProcess / beanstalkclient ... yes chef cookbooks / nginx ... yes chef cookbooks / postfix ... yes chef cookbooks / mongodb ... yes RunMyProcess / Documents ... yes RunMyProcess / Thread Manager ... yes RunMyProcess / mongo-java-driver ... yes RunMyProcess / json ... yes RunMyProcess / operations ... yes RunMyProcess / sdk-js ... yes RunMyProcess / deployment ... yes RunMyProcess / data-connector-agent ... yes RunMyProcess / sdc-proxy ... yes RunMyProcess / markdoc ... yes RunMyProcess / Python-Markdown ... yes RunMyProcess / Pygments ... yes chef cookbooks / logstash ... yes RunMyProcess / FGCP ... yes RunMyProcess / RunMyLog ... yes RunMyProcess / RunMyApp ... yes chef cookbooks / chef-percona ... yes RunMyProcess / SAP Protocol Handler ... yes RunMyProcess / Pricing scripts ... yes RunMyProcess / SEC Protocol Manager ... yes RunMyProcess / SEC SDK ... yes RunMyProcess / SEC Generic Protocol Handler ... yes RunMyProcess / User Guide ... yes chef cookbooks / munin ... yes chef cookbooks / monit ... yes RunMyProcess / client ... yes RunMyProcess / application-runner ... yes RunMyProcess / server ... yes Itagaki Yoshinori / FGCP ... yes Redis version >= 2.0.0? ... yes Your git bin path is "/usr/bin/git" Git version >= 1.7.10 ? ... yes (1.8.1)

Checking GitLab ... Finished

We have changed some paths in the init that is all. Here is the diff

/mnt/git/gitlab $ diff lib/support/init.d/gitlab /etc/init.d/gitlab 
18c18,20
< APP_ROOT="/home/git/gitlab"
---
> PATH=/usr/local/bin:$PATH; export PATH
> 
> APP_ROOT="/mnt/git/gitlab"
21,22c23,24
< PID_PATH="$APP_ROOT/tmp/pids"
< SOCKET_PATH="$APP_ROOT/tmp/sockets"
---
> PID_PATH="/mnt/git/gitlab/tmp/pids"
> SOCKET_PATH="/mnt/git/gitlab/tmp/sockets"`

By Administrator on 2013-07-05T10:19:23 (imported from GitLab project)

By Administrator on 2013-07-05T10:19:23 (imported from GitLab)

Created by: dzaporozhets

Fixed UI by b99f357e

By Administrator on 2013-08-04T14:19:28 (imported from GitLab project)

By Administrator on 2013-08-04T14:19:28 (imported from GitLab)

Created by: dzaporozhets

Because edit works for

blob/master/README.md

but not

blob/3804f6e09ac17e23ae882ca3bbef514e02008bcd/README.md

By Administrator on 2013-08-04T14:20:52 (imported from GitLab project)

By Administrator on 2013-08-04T14:20:52 (imported from GitLab)