From 505c895b219034de70779795db13d0a5d9e0a804 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 19 Dec 2018 12:53:20 +0800 Subject: [PATCH] RepoStatusPopover.bjs RepoStatusPopover.vala --- RepoStatusPopover.bjs | 2 +- RepoStatusPopover.vala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs index c85a7401..821af4b3 100644 --- a/RepoStatusPopover.bjs +++ b/RepoStatusPopover.bjs @@ -103,7 +103,7 @@ "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", diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index b0188264..f664fb3e 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -394,7 +394,7 @@ public class RepoStatusPopover : Object 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); -- 2.39.2