For mysterious reasons this unblocks 'git pull'
Merge request reports
Activity
mentioned in commit ac5bc14b
109 109 cd ${gitlab_development_root}/gitlab && \ 110 110 git checkout -- Gemfile.lock db/schema.rb && \ 111 111 git stash && git checkout master && \ 112 git pull --ff-only 112 git pull --ff-only upstream master Not everybody has 'upstream'. Revert if 8.16 fixes the hung
git pull
? What do you think @grzesiek@jacobvosmaer-gitlab I don't have
upstream
remote configured. Does it mean I can't usegdk update
now? If so, we probably should revert this change.Edited by Grzegorz BizonI suspect we don't need this change now that 8.16 has fixed gitlab-workhorse#92 (closed).
Edited by Stan Hu
This is causing
gdk update
to fail with following error.Your branch is up-to-date with 'origin/master'. fatal: 'upstream' does not appear to be a git repository fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. Makefile:109: recipe for target 'gitlab/.git/pull' failed make: *** [gitlab/.git/pull] Error 1
Since only remote present by default is
origin
which points to the Git URL which was used when setting up GDK, this command would fail when it looks for remoteupstream
, which is not present in case developer has role developer ongitlab-org
(eg; GitLab team member).mentioned in commit e0e32176
mentioned in merge request !244 (merged)
@kushalpandya @jacobvosmaer-gitlab Since gitlab-workhorse#92 (closed) is merged, we should be able to revert this MR. I submitted a reverting MR at https://gitlab.com/gitlab-org/gitlab-development-kit/merge_requests/244.
@grzesiek I am not sure if the workhorse problem causing the pull to hang has actually been fixed yet.