RepoStatusPopover.bjs

RepoStatusPopover.vala

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index c85a740..821af4b 100644 (file)
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -103,7 +103,7 @@
        "items" : [
         {
          "listeners" : {
        "items" : [
         {
          "listeners" : {

-          "button_press_event" : "() => {\n  \n   \n   GitMonitor.gitmonitor.stop();\n   _this.repo.git({ \"stash\" , \"--all\" });\n   _this.repo.loadStatus();\n   GitMonitor.gitmonitor.start();\n    _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n    _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n    Clones.singleton().reposStore.load();\n  \n   _this.el.hide();\n    return false;\n}"
+          "button_press_event" : "() => {\n  \n   \n   GitMonitor.gitmonitor.stop();\n   _this.repo.git({ \"reset\" , \"--hard\" });\n   _this.repo.loadStatus();\n   GitMonitor.gitmonitor.start();\n    _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n    _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n    Clones.singleton().reposStore.load();\n  \n   _this.el.hide();\n    return false;\n}"

          },
          "label" : "Reset to remote",
          "* pack" : "add",
          },
          "label" : "Reset to remote",
          "* pack" : "add",

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index b018826..f664fb3 100644 (file)
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -394,7 +394,7 @@ public class RepoStatusPopover : Object
               
                
                GitMonitor.gitmonitor.stop();
               
                
                GitMonitor.gitmonitor.stop();

-               _this.repo.git({ "stash" , "--all" });
+               _this.repo.git({ "reset" , "--hard" });

                _this.repo.loadStatus();
                GitMonitor.gitmonitor.start();
                 _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
                _this.repo.loadStatus();
                GitMonitor.gitmonitor.start();
                 _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);