Use %(file_old) for old filename in the blame view

Fixes #1226

2 files changed, 9 insertions, 2 deletions

diff --git a/src/blame.c b/src/blame.c
index 8da763f8..83025860 100644
--- a/src/blame.c
+++ b/src/blame.c
@@ -475,8 +475,11 @@ blame_select(struct view *view, struct line *line)
 	else
 		string_copy_rev(view->env->commit, commit->id);
 
-	if (commit->filename)
-		string_format(view->env->file, "%s", commit->filename);
+	if (strcmp(commit->filename, view->env->file))
+		string_format(view->env->file_old, "%s", commit->filename);
+	else
+		view->env->file_old[0] = '\0';
+
 	view->env->lineno = view->pos.lineno + 1;
 }
 
diff --git a/src/diff.c b/src/diff.c
index 1cb82937..2071c38e 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -811,6 +811,8 @@ diff_common_select(struct view *view, struct line *line, const char *changes_msg
 				const char *old_file = diff_get_pathname(view, header, true);
 				if (old_file)
 					string_format(view->env->file_old, "%s", old_file);
+				else
+					view->env->file_old[0] = '\0';
 				string_format(view->env->file, "%s", file);
 				view->env->lineno = view->env->goto_lineno = 0;
 				view->env->blob[0] = 0;
@@ -826,6 +828,8 @@ diff_common_select(struct view *view, struct line *line, const char *changes_msg
 			const char *old_file = diff_get_pathname(view, line, true);
 			if (old_file)
 				string_format(view->env->file_old, "%s", old_file);
+			else
+				view->env->file_old[0] = '\0';
 			if (changes_msg)
 				string_format(view->ref, "%s to '%s'", changes_msg, file);
 			string_format(view->env->file, "%s", file);