From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 19 Sep 2007 00:50:12 +0000 (+0200)
Subject: Fix open_editor to make the file path relative to the project root
X-Git-Tag: tig-0.9.1~15
X-Git-Url: https://git.distorted.org.uk/~mdw/tig/commitdiff_plain/7d31b0590bb4ae3f6a06d95e81ae54f13eebc632

Fix open_editor to make the file path relative to the project root

.. by prefixing the file path with opt_cdup if requested.
---

diff --git a/tig.c b/tig.c
index ac2aba0..3811a22 100644
--- a/tig.c
+++ b/tig.c
@@ -2143,11 +2143,12 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 }
 
 static void
-open_editor(struct view *view, char *file)
+open_editor(struct view *view, bool from_root, char *file)
 {
 	char cmd[SIZEOF_STR];
 	char file_sq[SIZEOF_STR];
 	char *editor;
+	char *prefix = from_root ? opt_cdup : "";
 
 	editor = getenv("GIT_EDITOR");
 	if (!editor && *opt_editor)
@@ -2160,7 +2161,7 @@ open_editor(struct view *view, char *file)
 		editor = "vi";
 
 	if (sq_quote(file_sq, 0, file) < sizeof(file_sq) &&
-	    string_format(cmd, "%s %s", editor, file_sq)) {
+	    string_format(cmd, "%s %s%s", editor, prefix, file_sq)) {
 		def_prog_mode();           /* save current tty modes */
 		endwin();                  /* restore original tty modes */
 		system(cmd);
@@ -3309,7 +3310,7 @@ status_request(struct view *view, enum request request, struct line *line)
 		if (!status)
 			return request;
 
-		open_editor(view, status->name);
+		open_editor(view, status->status != '?', status->name);
 		break;
 
 	case REQ_ENTER:
@@ -3543,7 +3544,7 @@ stage_request(struct view *view, enum request request, struct line *line)
 		if (!stage_status.name[0])
 			return request;
 
-		open_editor(view, stage_status.name);
+		open_editor(view, stage_status.status != '?', stage_status.name);
 		break;
 
 	case REQ_ENTER: