#5662: With no local commits, and the local map being unaffected by t…

…he remote changes the strategy should be a fast-forward.
codereader · Jul 31, 2021 · 2353158 · 2353158
1 parent 29f44c9
commit 2353158
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/plugins/vcs/Algorithm.h b/plugins/vcs/Algorithm.h
@@ -100,7 +100,7 @@ inline RemoteStatus analyseRemoteStatus(const std::shared_ptr<Repository>& repos
     {
         // Remote didn't change the map, we can integrate it without conflicting the loaded map
         return RemoteStatus{ status.localCommitsAhead, status.remoteCommitsAhead, _("Integrate"), 
-            RequiredMergeStrategy::MergeRecursively };
+            status.localCommitsAhead == 0 ? RequiredMergeStrategy::FastForward : RequiredMergeStrategy::MergeRecursively };
     }
 
     if (mapFileHasUncommittedChanges)

diff --git a/plugins/vcs/ui/VcsStatus.cpp b/plugins/vcs/ui/VcsStatus.cpp
@@ -351,6 +351,7 @@ void VcsStatus::performSync(std::shared_ptr<git::Repository> repository)
     catch (git::GitException& ex)
     {
         setRemoteStatus(git::RemoteStatus{ 0, 0, ex.what() });
+        wxutil::Messagebox::ShowError(ex.what());
     }
 }