Skip to content
Snippets Groups Projects

For mysterious reasons this unblocks 'git pull'

Merged Jacob Vosmaer (GitLab) requested to merge git-pull-fix-hang into master
1 unresolved thread

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
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
  • 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 remote upstream, which is not present in case developer has role developer on gitlab-org (eg; GitLab team member).

  • Grzegorz Bizon mentioned in commit e0e32176

    mentioned in commit e0e32176

  • Grzegorz Bizon mentioned in merge request !244 (merged)

    mentioned in merge request !244 (merged)

  • @grzesiek I am not sure if the workhorse problem causing the pull to hang has actually been fixed yet.

  • I just tested gdk update with the upstream master bit removed and it seems to work now.

  • Please register or sign in to reply
    Loading