Revert change to put %(ref):%(file) in the blame view title

[tig.git] / tig.c

diff --git a/tig.c b/tig.c
index c60a6af299a4858c2e296162db46e3b982f8f295..d33d3eb528c8920328cb4b4e87d9b1fe6a9119a7 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -2720,6 +2720,7 @@ load_view(struct view *view, enum open_flags flags)
 }
 
 #define refresh_view(view) load_view(view, OPEN_REFRESH)
+#define reload_view(view) load_view(view, OPEN_RELOAD)
 
 static void
 split_view(struct view *prev, struct view *view)
@@ -4124,11 +4125,10 @@ blame_open(struct view *view, enum open_flags flags)
 
        if (*opt_ref || !begin_update(view, opt_cdup, file_argv, flags)) {
                const char *blame_cat_file_argv[] = {
-                       "git", "cat-file", "blob", path, NULL
+                       "git", "cat-file", "blob", "%(ref):%(file)", NULL
                };
 
-               if (!string_format(path, "%s:%s", opt_ref, opt_file) ||
-                   !begin_update(view, opt_cdup, blame_cat_file_argv, flags))
+               if (!begin_update(view, opt_cdup, blame_cat_file_argv, flags))
                        return FALSE;
        }
 
@@ -4150,7 +4150,7 @@ blame_open(struct view *view, enum open_flags flags)
                        free(blame->commit);
        }
 
-       string_format(view->vid, "%s:%s", opt_ref, opt_file);
+       string_format(view->vid, "%s", opt_file);
        string_format(view->ref, "%s ...", opt_file);
 
        return TRUE;
@@ -4427,7 +4427,7 @@ blame_request(struct view *view, enum request request, struct line *line)
                        string_copy(opt_file, blame->commit->filename);
                        if (blame->lineno)
                                view->lineno = blame->lineno;
-                       refresh_view(view);
+                       reload_view(view);
                }
                break;
 
@@ -4440,7 +4440,7 @@ blame_request(struct view *view, enum request request, struct line *line)
                        string_copy_rev(opt_ref, blame->commit->parent_id);
                        string_copy(opt_file, blame->commit->parent_filename);
                        setup_blame_parent_line(view, blame);
-                       refresh_view(view);
+                       reload_view(view);
                }
                break;