Cannot update repo

[drnic]

I ran git pull and it aborted. Did the import of the vcap-services repo break old history or corrupt the repo or any other ideas?

$ git pull
remote: Counting objects: 2595, done.
remote: Compressing objects: 100% (1119/1119), done.
remote: Total 2590 (delta 1332), reused 2590 (delta 1332)
Receiving objects: 100% (2590/2590), 12.87 MiB | 16 KiB/s, done.
Resolving deltas: 100% (1332/1332), completed with 3 local objects.
From git://github.com/cloudfoundry/cf-services-release
   813027d..0399a83  master     -> origin/master
Updating 813027d..0399a83
error: The following untracked working tree files would be overwritten by merge:
    src/services/.gitignore
    src/services/LICENSE
    src/services/NOTICE
    src/services/README
    src/services/ng/mysql/.gitignore
    src/services/ng/mysql/.rspec
    src/services/ng/mysql/Gemfile
    src/services/ng/mysql/Gemfile.bak
    src/services/ng/mysql/Gemfile.lock
    src/services/ng/mysql/Gemfile.orig
    src/services/ng/mysql/README
    src/services/ng/mysql/Rakefile
    src/services/ng/mysql/bin/mysql_backup
    src/services/ng/mysql/bin/mysql_gateway
    src/services/ng/mysql/bin/mysql_node
    src/services/ng/mysql/bin/mysql_worker
    src/services/ng/mysql/config/mysql_backup.yml
    src/services/ng/mysql/config/mysql_gateway.yml
    src/services/ng/mysql/config/mysql_node.yml
    src/services/ng/mysql/config/mysql_worker.yml
    src/services/ng/mysql/lib/mysql_service/common.rb
    src/services/ng/mysql/lib/mysql_service/job.rb
    src/services/ng/mysql/lib/mysql_service/job/mysql_serialization.rb
    src/services/ng/mysql/lib/mysql_service/job/mysql_snapshot.rb
    src/services/ng/mysql/lib/mysql_service/mysql2_timeout.rb
    src/services/ng/mysql/lib/mysql_service/mysql_error.rb
    src/services/ng/mysql/lib/mysql_service/node.rb
    src/services/ng/mysql/lib/mysql_service/provisioner.rb
    src/services/ng/mysql/lib/mysql_service/rds/transaction_killer.rb
    src/services/ng/mysql/lib/mysql_service/standard/transaction_killer.rb
    src/services/ng/mysql/lib/mysql_service/storage_quota.rb
    src/services/ng/mysql/lib/mysql_service/transaction_killer.rb
    src/services/ng/mysql/lib/mysql_service/util.rb
    src/services/ng/mysql/lib/mysql_service/with_warden.rb
    src/services/ng/mysql/lib/mysql_service/without_warden.rb
    src/services/ng/mysql/spec/functional/mysql_connection_pool_spec.rb
    src/services/ng/mysql/spec/functional/mysql_node_spec.rb
    src/services/ng/mysql/spec/functional/mysql_provisioner_spec.rb
    src/services/ng/mysql/spec/integration/mysql_shared_spec.rb
    src/services/ng/mysql/spec/integration/snapshots_spec.rb
    src/services/ng/mysql/spec/spec_helper.rb
    src/services/ng/mysql/spec/support/functional_example_group.rb
    src/services/ng/mysql/spec/support/mysql_runner.rb
    src/services/ng/mysql/spec/unit/mysql_service/node_spec.rb
    src/services/ng/mysql/spec/unit/mysql_service/rds/transaction_killer_spec.rb
    src/services/ng/mysql/spec/unit/mysql_service/standard/transaction_killer_spec.rb
    src/services/ng/mysql/spec/unit/mysql_service/transaction_killer_spec.rb
    src/services/ng/mysql/vendor/cache/activesupport-3.2.13.gem
    src/services/ng/mysql/vendor/cache/addressable-2.2.8.gem
    src/services/ng/mysql/vendor/cache/bcrypt-ruby-2.1.4.gem
    src/services/ng/mysql/vendor/cache/beefcake-0.3.7.gem
    src/services/ng/mysql/vendor/cache/builder-3.0.0.gem
    src/services/ng/mysql/vendor/cache/cf-uaa-lib-1.3.10.gem
    src/services/ng/mysql/vendor/cache/ci_reporter-1.6.4.gem
    src/services/ng/mysql/vendor/cache/cookiejar-0.3.0.gem
    src/services/ng/mysql/vendor/cache/curb-0.7.18.gem
    src/services/ng/mysql/vendor/cache/daemons-1.1.9.gem
    src/services/ng/mysql/vendor/cache/data_objects-0.10.12.gem
    src/services/ng/mysql/vendor/cache/datamapper-1.1.0.gem
    src/services/ng/mysql/vendor/cache/diff-lcs-1.2.2.gem
    src/services/ng/mysql/vendor/cache/dm-aggregates-1.1.0.gem
    src/services/ng/mysql/vendor/cache/dm-constraints-1.1.0.gem
    src/services/ng/mysql/vendor/cache/dm-core-1.1.0.gem
    src/services/ng/mysql/vendor/cache/dm-do-adapter-1.1.0.gem
    src/services/ng/mysql/vendor/cache/dm-migrations-1.1.0.gem
    src/services/ng/mysql/vendor/cache/dm-mysql-adapter-1.1.0.gem
    src/services/ng/mysql/vendor/cache/dm-serializer-1.1.0.gem
    src/services/ng/mysql/vendor/cache/dm-sqlite-adapter-1.1.0.gem
    src/services/ng/mysql/vendor/cache/dm-timestamps-1.1.0.gem
    src/services/ng/mysql/vendor/cache/dm-transactions-1.1.0.gem
    src/services/ng/mysql/vendor/cache/dm-types-1.1.0.gem
    src/services/ng/mysql/vendor/cache/dm-validations-1.1.0.gem
    src/services/ng/mysql/vendor/cache/do_mysql-0.10.12.gem
    src/services/ng/mysql/vendor/cache/do_sqlite3-0.10.12.gem
    src/services/ng/mysql/vendor/cache/em-http-request-1.0.3.gem
    src/services/ng/mysql/vendor/cache/em-socksify-
Aborting

[matt-royal]

I was just able to reproduce this problem. Apparently git is confused by the removal of the src/services submodule. For now you can avoid this by first running "rm -rf src/services" then pulling. I'll research a better solution.

[drnic]

A clean clone worked too. Unsure about the PR branches mergeabiliy. Hope they are ok.

[jfoley]

This is a quirk of git submodules. They will not checkout over existing files. Closing.

@aramprice / @jfoley