Dirk, With the latest master (fcc615a) on desktop (Fedora 23), my dive list fails to load on startup. There is an error in blue/aqua box at the base of screen: "created GPS source; Unable to look up revision '***triangle character pointing to left****'"
KCharSelect tells me that character is U+0001, name: <control>. The terminal output with -v -v is: $ ./subsurface -vv QInotifyFileSystemWatcherEngine::addPaths: inotify_add_watch failed: No such file or directory already have loaded SHA (null) - don't load again File locations: Local git storage: /home/rick/.subsurface/cloudstorage/7033a3cd3d2b65ca Cloud URL: https://cloud.subsurface-divelog.org//git/[email protected][[email protected]] Image hashes: /home/rick/.subsurface/hashes Local picture directory: /home/rick/.subsurface/picturedata/ I used git bisect to trace the offending commit to: [8c1cc4524d19e05b816f3388448cacd735d64504] Don't reload identical data --- a/subsurface-core/file.c +++ b/subsurface-core/file.c @@ -9,6 +9,7 @@ #include <time.h> #include "dive.h" +#include "divelist.h" #include "file.h" #include "git-access.h" #include "qthelperfromc.h" @@ -447,6 +448,14 @@ int parse_file(const char *filename) * give up here and don't send errors about git repositories */ return 0; + /* do we already have this exact state loaded ? + * get the SHA and compare with what we currently have */ + const char * sha = get_sha(git, branch); + if (same_string(sha, saved_git_id) && !unsaved_changes()) { + fprintf(stderr, "already have loaded SHA %s - don't load again\n", sha); + return 0; + } + I guess the 'return 0' is causing my problem, but I don't know what it should do. Cheers, Rick
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
