fix: follow only makes sense when file is provided

timbrel · Mar 1, 2018 · b51ef1d · b51ef1d
1 parent 29321a3
commit b51ef1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/commands/log.py b/core/commands/log.py
@@ -26,7 +26,7 @@ def run(self, *args, file_path=None, **kwargs):
 
     def run_async(self, file_path=None, **kwargs):
         savvy_settings = sublime.load_settings("GitSavvy.sublime-settings")
-        follow = savvy_settings.get("log_follow_rename")
+        follow = savvy_settings.get("log_follow_rename") if file_path else False
         show_log_panel(
             self.log_generator(file_path=file_path, follow=follow, **kwargs),
             lambda commit: self.on_done(commit, file_path=file_path, **kwargs)

diff --git a/core/commands/log_graph.py b/core/commands/log_graph.py
@@ -46,7 +46,7 @@ def get_graph_args(self):
         savvy_settings = sublime.load_settings("GitSavvy.sublime-settings")
         args = savvy_settings.get("git_graph_args")
         follow = savvy_settings.get("log_follow_rename")
-        if follow:
+        if self._file_path and follow:
             args = args + ["--follow"]
         if self._file_path:
             file_path = self.get_rel_path(self._file_path)