Change git branches cleanly (#1026)

elementary · Jul 15, 2021 · 8e02deb · 8e02deb
1 parent b0c4050
commit 8e02deb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/FolderManager/ProjectFolderItem.vala b/src/FolderManager/ProjectFolderItem.vala
@@ -145,7 +145,10 @@ namespace Scratch.FolderManager {
             menu.append (create_submenu_for_new ());
 
             if (monitored_repo != null) {
-                menu.append (new ChangeBranchMenu (this));
+                var branch_menu = new ChangeBranchMenu (this) {
+                    sensitive = !monitored_repo.has_uncommitted
+                };
+                menu.append (branch_menu);
             }
 
             menu.append (new Gtk.SeparatorMenuItem ());

diff --git a/src/Services/MonitoredRepository.vala b/src/Services/MonitoredRepository.vala
@@ -73,6 +73,12 @@ namespace Scratch.Services {
             }
         }
 
+        public bool has_uncommitted {
+            get {
+                return file_status_map.size > 0;
+            }
+        }
+
         construct {
             file_status_map = new Gee.HashMap<string, Ggit.StatusFlags?> ();
             status_options = new Ggit.StatusOptions (
@@ -172,6 +178,13 @@ namespace Scratch.Services {
         public void change_branch (string new_branch_name) throws Error {
             var branch = git_repo.lookup_branch (new_branch_name, Ggit.BranchType.LOCAL);
             git_repo.set_head (((Ggit.Ref)branch).get_name ());
+            var options = new Ggit.CheckoutOptions () {
+                //Ensure documents match checked out branch (deal with potential conflicts/losses beforehand)
+                strategy = Ggit.CheckoutStrategy.FORCE
+            };
+
+            git_repo.checkout_head (options);
+
             branch_name = new_branch_name;
         }