Enable textconv in the stage view

koutcher · May 25, 2022 · a56671d · a56671d
1 parent 7e8de4f
commit a56671d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/NEWS.adoc b/NEWS.adoc
@@ -14,6 +14,7 @@ Bug fixes:
  - Improve escaping of variables in external commands.
  - Fix cursor behaviour during staging. (#842, #1028)
  - Fix navigation in split tree view.
+ - Enable textconv in the stage view.
 
 tig-2.5.5
 ---------

diff --git a/include/tig/git.h b/include/tig/git.h
@@ -26,12 +26,12 @@
 	GIT_DIFF_INITIAL(encoding_arg, "--cached", context_arg, space_arg, "", new_name)
 
 #define GIT_DIFF_STAGED(encoding_arg, context_arg, space_arg, old_name, new_name) \
-	"git", "diff-index", (encoding_arg), "--root", "--patch-with-stat", "-C", "-M", \
+	"git", "diff-index", (encoding_arg), "--root", "--textconv", "--patch-with-stat", "-C", "-M", \
 		"--cached", "--diff-filter=ACDMRTXB", DIFF_ARGS, "%(cmdlineargs)", (context_arg), (space_arg), "HEAD", \
 		"--", (old_name), (new_name), NULL
 
 #define GIT_DIFF_UNSTAGED(encoding_arg, context_arg, space_arg, old_name, new_name) \
-	"git", "diff-files", (encoding_arg), "--root", "--patch-with-stat", "-C", "-M", \
+	"git", "diff-files", (encoding_arg), "--root", "--textconv", "--patch-with-stat", "-C", "-M", \
 		DIFF_ARGS, "%(cmdlineargs)", (context_arg), (space_arg), "--", (old_name), (new_name), NULL
 
 /* Don't show staged unmerged entries. */

diff --git a/src/stage.c b/src/stage.c
@@ -711,7 +711,7 @@ stage_open(struct view *view, enum open_flags flags)
 	/* Diffs for unmerged entries are empty when passing the new
 	 * path, so leave out the new path. */
 	const char *files_unmerged_argv[] = {
-		"git", "diff-files", encoding_arg, "--root", "--patch-with-stat",
+		"git", "diff-files", encoding_arg, "--root", "--textconv", "--patch-with-stat",
 			DIFF_ARGS, diff_context_arg(), ignore_space_arg(), "--",
 			stage_status.old.name, NULL
 	};