aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2016-03-29 20:46:12 -0500
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-03-29 20:46:12 -0500
commit5e8930a1798364ecc6c47997af6e9bc83b0325de (patch)
tree551533644b4e7a475491954e4b53094d7e0813ee
parent501f8ba6a486c0a79d563f08403792a0f3279ca9 (diff)
downloadsubsurface-5e8930a1798364ecc6c47997af6e9bc83b0325de.tar.gz
If the cache was valid, we don't want to reload just because of changes
This was exactly backwards. If there already are changes we do NOT want to reload - that would overwrite those changes for no good reason; after all, the starting point was correct, so why throw the changes away? Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--subsurface-core/file.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/subsurface-core/file.c b/subsurface-core/file.c
index cf7b680e7..1337da3a2 100644
--- a/subsurface-core/file.c
+++ b/subsurface-core/file.c
@@ -453,8 +453,7 @@ int check_git_sha(const char *filename)
if (git && git != dummy_git_repository) {
const char *sha = get_sha(git, branch);
if (!same_string(sha, "") &&
- same_string(sha, saved_git_id) &&
- !unsaved_changes()) {
+ same_string(sha, saved_git_id)) {
fprintf(stderr, "already have loaded SHA %s - don't load again\n", sha);
return 0;
}