From e4e63b9dc9ba5c48ee26c06ca168e32c7b5c08be Mon Sep 17 00:00:00 2001
From: Thomas Koutcher <thomas.koutcher@online.fr>
Date: Wed, 5 Feb 2025 18:58:21 +0100
Subject: [PATCH] Fix empty blame view when opened from the diff view on i586

The regression was introduced by 2a8ef0ffbc6c52270c9ce60d16dcf2c544428f92.

Fixes #1362
---
 NEWS.adoc  | 8 ++++++++
 src/diff.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/NEWS.adoc b/NEWS.adoc
index c5b8e955e..a9d49d08b 100644
--- a/NEWS.adoc
+++ b/NEWS.adoc
@@ -1,6 +1,13 @@
 Release notes
 =============
 
+master
+------
+
+Bug fixes:
+
+ - Fix empty blame view when opened from the diff view on i586. (#1362)
+
 tig-2.5.11
 ----------
 
@@ -26,6 +33,7 @@ Improvements:
  - Allow different colors for all references types.
  - Enable search in sections titles. (#1043)
  - Show committer date by default in the date column. (#294)
+ - Update utf8proc to v2.10.0, supporting Unicode 16.
  - Only show stash, notes and prefetch in the refs view when
    invoked with `tig refs --all`. (#1359)
 
diff --git a/src/diff.c b/src/diff.c
index 778f48bec..9f070f53c 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -698,7 +698,7 @@ diff_trace_origin(struct view *view, enum request request, struct line *line)
 	}
 
 	string_ncopy(view->env->file, commit.filename, strlen(commit.filename));
-	string_copy(request == REQ_VIEW_BLAME ? view->env->ref : view->env->commit, header.id);
+	string_copy_rev(request == REQ_VIEW_BLAME ? view->env->ref : view->env->commit, header.id);
 	view->env->goto_lineno = header.orig_lineno - 1;
 
 	return request;