Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unable to use msync on already checked out module #81

Open
bastelfreak opened this issue Jun 26, 2016 · 4 comments
Open

unable to use msync on already checked out module #81

bastelfreak opened this issue Jun 26, 2016 · 4 comments

Comments

@bastelfreak
Copy link
Member

I'm not sure if I'm using it wrong or if it is really broken: I've synced the zabbix module in the past, it is already checked out at modules/puppet-zabbix. I'm unable to do a new modulesync:

$ bundle exec msync update -f zabbix --message "modulesync 0.8.1" 
Syncing puppet-zabbix
Overriding any local changes to repositories in ./modules
Creating local branch modulesync from origin/modulesync
bundler: failed to load command: msync (/home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/bin/msync)
Git::GitExecuteError: git '--git-dir=/home/bastelfreak/modulesync_config/modules/puppet-zabbix/.git' '--work-tree=/home/bastelfreak/modulesync_config/modules/puppet-zabbix' checkout 'origin/modulesync'  2>&1:error: pathspec 'origin/modulesync' did not match any file(s) known to git.
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/gems/git-1.3.0/lib/git/lib.rb:937:in `command'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/gems/git-1.3.0/lib/git/lib.rb:644:in `checkout'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/gems/git-1.3.0/lib/git/base.rb:306:in `checkout'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/gems/modulesync-0.6.1/lib/modulesync/git.rb:23:in `switch_branch'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/gems/modulesync-0.6.1/lib/modulesync/git.rb:54:in `block in pull'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/gems/modulesync-0.6.1/lib/modulesync/git.rb:49:in `chdir'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/gems/modulesync-0.6.1/lib/modulesync/git.rb:49:in `pull'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/gems/modulesync-0.6.1/lib/modulesync.rb:61:in `block in run'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/gems/modulesync-0.6.1/lib/modulesync.rb:57:in `each'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/gems/modulesync-0.6.1/lib/modulesync.rb:57:in `run'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/gems/modulesync-0.6.1/bin/msync:8:in `<top (required)>'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/bin/msync:23:in `load'
  /home/bastelfreak/modulesync_config/.vendor/ruby/2.3.0/bin/msync:23:in `<top (required)>'

I think the issue is that it tries to checkout a remote branch called modulesync, but it doesn't exist.

@rski
Copy link
Member

rski commented Jun 26, 2016

Have you edited your gitconfig file at all? I remember igalic had a mysterious issue at some point due to his git config.

@bastelfreak
Copy link
Member Author

My git config should be fine:

[user]
    email = tim@bastelfreak.de
    name = Tim Meusel
    signingkey = BF1C4CC0
[push]
  default = simple
[alias]
  # Usage: git signoff-rebase [base-commit]
  signoff-rebase = "!EDITOR='sed -i -re s/^pick/e/' sh -c 'git rebase -i $1 && while test -f .git/rebase-merge/interactive; do git commit --amend --signoff --no-edit && git rebase --continue; done' -"
  # Ideally we would use GIT_SEQUENCE_EDITOR in the above instead of EDITOR but that's not supported for git < 1.7.8.
  # See http://cat.pdx.edu/~hunner/git-lg.png for an example
  lg = "log --pretty=format:'%C(yellow)%h%C(reset) %C(blue)%an%C(reset) %C(cyan)%cr%C(reset) %s %C(green)%d%C(reset)' --graph --date-order"
[commit]
    gpgsign = true

@rnelson0
Copy link
Sponsor Member

Have you tried a git clean -ffdx to make sure cached files aren't causing
this?

Rob Nelson
rnelson0@gmail.com

@james-powis
Copy link
Member

I have seen a similar issue when the module has msync'ed before and the resulting remote branch was removed post merge, I suspect that is the issue being seen here... to confirm removing modules/#{mod} should clear the issue.

neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 21, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 21, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 21, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 22, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 23, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 23, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 23, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 23, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 23, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 23, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 23, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Apr 27, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Oct 8, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Oct 8, 2021
neomilium added a commit to opus-codium/modulesync that referenced this issue Oct 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants