search

shanzi / diumoo

Third party Douban.FM client for Mac
http://diumoo.net
Other
377 stars 48 forks source link

"git submodule init" issue after cloning from github verison 1.5.0 #4

Closed lane128 closed 8 years ago

lane128 commented 8 years ago

According to the README.

$ git submodule init
fatal: no submodule mapping found in .gitmodules for path 'extern/EDStarRating'

So, I checked the .gitmodules file.

[submodule "extern/MASShortcut"]
    path = extern/MASShortcut
    url = https://github.com/shpakovski/MASShortcut.git
[submodule "extern/SPMediaKeyTap"]
    path = extern/SPMediaKeyTap
    url = https://github.com/nevyn/SPMediaKeyTap.git
[submodule "extern/SMTabBar"]
    path = extern/SMTabBar
    url = https://github.com/smic/InspectorTabBar.git

But

 $ git ls-files --stage | grep 160000
160000 99bf39dc3f7579925ff4a08041c964bceb5db630 0   extern/EDStarRating
160000 9471ddbc7cc6f74aa4fef4bd445e0a9a4b0c7fe0 0   extern/MASShortcut
160000 63daa7f84f78b853b42e2dabaf2d1720df77077d 0   extern/SMTabBar
160000 338bebf5a813a75e5fb9a3bc45b119d223bf1746 0   extern/SPMediaKeyTap

There is a register for extern/EDStarRating I think it is needless extern.

lane @ Lanes-MacBook-Pro : ~/diumoo  [ master ✔ ]                                                                                                                                                                                     16d
➜  git rm --cached extern/EDStarRating
rm 'extern/EDStarRating'

lane @ Lanes-MacBook-Pro : ~/diumoo  [ master ✗ ]                                                                                                                                                                                   16d ✖
➜  git ls-files --stage | grep 160000
160000 9471ddbc7cc6f74aa4fef4bd445e0a9a4b0c7fe0 0   extern/MASShortcut
160000 63daa7f84f78b853b42e2dabaf2d1720df77077d 0   extern/SMTabBar
160000 338bebf5a813a75e5fb9a3bc45b119d223bf1746 0   extern/SPMediaKeyTap

lane @ Lanes-MacBook-Pro : ~/diumoo  [ master ✗ ]                                                                                                                                                                                   16d ✖
➜  git submodule init
Submodule 'extern/MASShortcut' (https://github.com/shpakovski/MASShortcut.git) registered for path 'extern/MASShortcut'
Submodule 'extern/SMTabBar' (https://github.com/smic/InspectorTabBar.git) registered for path 'extern/SMTabBar'
Submodule 'extern/SPMediaKeyTap' (https://github.com/nevyn/SPMediaKeyTap.git) registered for path 'extern/SPMediaKeyTap'

lane @ Lanes-MacBook-Pro : ~/diumoo  [ master ✗ ]                                                                                                                                                                                   16d ✖
➜  git submodule update
Cloning into 'extern/MASShortcut'...
remote: Counting objects: 1047, done.
remote: Total 1047 (delta 0), reused 0 (delta 0), pack-reused 1047
Receiving objects: 100% (1047/1047), 473.63 KiB | 62.00 KiB/s, done.
Resolving deltas: 100% (612/612), done.
Checking connectivity... done.
Submodule path 'extern/MASShortcut': checked out '9471ddbc7cc6f74aa4fef4bd445e0a9a4b0c7fe0'
Cloning into 'extern/SMTabBar'...
remote: Counting objects: 195, done.
remote: Total 195 (delta 0), reused 0 (delta 0), pack-reused 195
Receiving objects: 100% (195/195), 55.57 KiB | 0 bytes/s, done.
Resolving deltas: 100% (119/119), done.
Checking connectivity... done.
Submodule path 'extern/SMTabBar': checked out '63daa7f84f78b853b42e2dabaf2d1720df77077d'
Cloning into 'extern/SPMediaKeyTap'...
remote: Counting objects: 130, done.
remote: Total 130 (delta 0), reused 0 (delta 0), pack-reused 130
Receiving objects: 100% (130/130), 40.08 KiB | 0 bytes/s, done.
Resolving deltas: 100% (59/59), done.
Checking connectivity... done.
Submodule path 'extern/SPMediaKeyTap': checked out '338bebf5a813a75e5fb9a3bc45b119d223bf1746'

just remove the register for extern/EDStarRating from git track.

Cheer~ it works.

After fix the submodules issue. the swift shows lots of error. @AnakinMac can you have a look at those Swift file. Thanks.

tchaikov commented 8 years ago

@lane128 Adam, are you using xcode 8.0? if not, you might want to use xcode 8.0 (still in beta) to compile the swift code, they were updated to use the 3.0 features. i failed to build this project using the xcode 7.3, only to find that the swift code were revamped recently by @AnakinMac with the 3.0 syntax.

HTH

lane128 commented 8 years ago

@tchaikov I am using the Xcode 7.3 right now. Cause of the development of other projects , I would not update the Xcode beta version. So any other way to run the project on Xcode 7.3?

shanzi commented 8 years ago

@AnakinMac Maybe we should move swift codes to a new branch and reset the master branch to v1.5.0. The master branch should be used as release branch then.

AnakinMac commented 8 years ago

@shanzi I'll create a v1.5 branch as a snapshot of a release. Since we don't have a lot of integration issues, I think master branch should be a development branch.

@lane128 It is perfectly fine to use Xcode beta along with Xcode release version. To build with Xcode 7.3, maybe use beta version of swiftlang, not really sure about it.

lane128 commented 8 years ago

@AnakinMac @shanzi It would be great to create a develop branch for other contributors to pull request. and the issue is resolved. So I close it.

tchaikov commented 8 years ago

imho, in general, the pull requests should be targeting master. the development process would be too heavy-weight to have a branch for backporting fixes. anyway, it's @AnakinMac and @shanzi 's call.

AnakinMac commented 8 years ago

@tchaikov @lane128 diumoo is a tiny project pre se, I don't want to keep too much legacy work. Pull request please target at master branch if possible.

shanzi commented 8 years ago

@AnakinMac How about using a release branch and uses tags on that branch for versioning and releasing.

We may need to add some instructions to README.md

AnakinMac commented 8 years ago

@shanzi sounds good to me.