cd ~/src/subsurface git submodule update
/D > On Jan 8, 2018, at 11:24 AM, Cristian Ionescu-Idbohrn > <[email protected]> wrote: > > This is what I did, yesterday: > > $ git fetch > remote: Counting objects: 143, done. > remote: Compressing objects: 100% (18/18), done. > remote: Total 143 (delta 103), reused 118 (delta 103), pack-reused 22 > Receiving objects: 100% (143/143), 49.36 KiB | 16.45 MiB/s, done. > Resolving deltas: 100% (103/103), completed with 34 local objects. > From git://github.com/Subsurface-divelog/subsurface > 47bf5cf5e..04626b089 master -> origin/master > + 4bc50a2b9...22bfeb999 coverity_scan -> origin/coverity_scan (forced update) > Fetching submodule libdivecomputer > From git://github.com/Subsurface-divelog/libdc > c354ae0..70ad30b Subsurface-branch -> origin/Subsurface-branch > + c2d9108...b48a4a5 coverityCleanup -> origin/coverityCleanup (forced > update) > > $ git pull > Updating 47bf5cf5e..04626b089 > Fast-forward > CHANGELOG.md | 1 + > core/dive.h | 4 +- > core/divelist.c | 8 +- > core/divelist.h | 2 +- > core/divesite.c | 4 +- > core/divesitehelpers.cpp | 2 - > core/libdivecomputer.c | 12 +- > core/load-git.c | 2 +- > core/parse-xml.c | 9 +- > core/parse.c | 2 +- > core/parse.h | 5 +- > core/pref.h | 1 - > core/save-git.c | 9 +- > core/subsurface-qt/SettingsObjectWrapper.cpp | 17 --- > core/subsurface-qt/SettingsObjectWrapper.h | 4 - > core/subsurfacestartup.c | 1 - > core/uemis-downloader.c | 2 - > desktop-widgets/mainwindow.cpp | 131 +++++++++++++-------- > desktop-widgets/mainwindow.h | 5 +- > desktop-widgets/mainwindow.ui | 9 +- > .../preferences/preferences_network.cpp | 2 - > desktop-widgets/preferences/preferences_network.ui | 7 -- > desktop-widgets/subsurfacewebservices.cpp | 124 +------------------ > libdivecomputer | 2 +- > mobile-widgets/qmlmanager.cpp | 1 - > qt-models/divelistmodel.cpp | 1 + > tests/testgitstorage.cpp | 1 - > tests/testpreferences.cpp | 4 - > 28 files changed, 134 insertions(+), 238 deletions(-) > > and ended up with: > > $ git status > On branch master > Your branch is up to date with 'origin/master'. > > Changes not staged for commit: > (use "git add <file>..." to update what will be committed) > (use "git checkout -- <file>..." to discard changes in working > directory) > > modified: libdivecomputer (new commits) > > no changes added to commit (use "git add" and/or "git commit -a") > > which doesn't look wright to me. Looking deeper into it, I see this: > > $ git diff | cat > diff --git a/libdivecomputer b/libdivecomputer > index 70ad30bed..8ae735a4d 160000 > --- a/libdivecomputer > +++ b/libdivecomputer > @@ -1 +1 @@ > -Subproject commit 70ad30bed30ce1b0b10eced0ffa7a115fed51d80 > +Subproject commit 8ae735a4d70307ebe2a42d315697f02ce71dbe88 > > How am I (a git novice) expected to react? > > Repeating the procedure today again, I pull more "stuff". Still, the > same ... > > $ git diff | cat > diff --git a/libdivecomputer b/libdivecomputer > index 70ad30bed..8ae735a4d 160000 > --- a/libdivecomputer > +++ b/libdivecomputer > @@ -1 +1 @@ > -Subproject commit 70ad30bed30ce1b0b10eced0ffa7a115fed51d80 > +Subproject commit 8ae735a4d70307ebe2a42d315697f02ce71dbe88 > > What am I missing? > > > Cheers, > > -- > Cristian > _______________________________________________ > subsurface mailing list > [email protected] > http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface _______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
