X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/11359638c5dfc91b4b14a003a0519b2a5bc7f89d..fef9238e38364e160c8f212686f4e4501c19f94e:/tig.c

diff --git a/tig.c b/tig.c
index f7f50ca..fbc65b9 100644
--- a/tig.c
+++ b/tig.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006 Jonas Fonseca <fonseca@diku.dk>
+/* Copyright (c) 2006-2007 Jonas Fonseca <fonseca@diku.dk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -11,8 +11,12 @@
  * GNU General Public License for more details.
  */
 
-#ifndef VERSION
-#define VERSION "unknown-version"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef TIG_VERSION
+#define TIG_VERSION "unknown-version"
 #endif
 
 #ifndef DEBUG
@@ -76,6 +80,9 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset,
 #define COLOR_DEFAULT	(-1)
 
 #define ICONV_NONE	((iconv_t) -1)
+#ifndef ICONV_CONST
+#define ICONV_CONST	/* nothing */
+#endif
 
 /* The format and size of the date column in the main view. */
 #define DATE_FORMAT	"%Y-%m-%d %H:%M"
@@ -90,17 +97,21 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset,
 
 #define	SCALE_SPLIT_VIEW(height)	((height) * 2 / 3)
 
+#ifndef GIT_CONFIG
+#define GIT_CONFIG "git config"
+#endif
+
 #define TIG_LS_REMOTE \
 	"git ls-remote $(git rev-parse --git-dir) 2>/dev/null"
 
 #define TIG_DIFF_CMD \
-	"git show --root --patch-with-stat --find-copies-harder -B -C %s 2>/dev/null"
+	"git show --no-color --root --patch-with-stat --find-copies-harder -B -C %s 2>/dev/null"
 
 #define TIG_LOG_CMD	\
-	"git log --cc --stat -n100 %s 2>/dev/null"
+	"git log --no-color --cc --stat -n100 %s 2>/dev/null"
 
 #define TIG_MAIN_CMD \
-	"git log --topo-order --pretty=raw %s 2>/dev/null"
+	"git log --no-color --topo-order --pretty=raw %s 2>/dev/null"
 
 #define TIG_TREE_CMD	\
 	"git ls-tree %s %s"
@@ -112,6 +123,7 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset,
 #define TIG_HELP_CMD	""
 #define TIG_PAGER_CMD	""
 #define TIG_STATUS_CMD	""
+#define TIG_STAGE_CMD	""
 
 /* Some ascii-shorthands fitted into the ncurses namespace. */
 #define KEY_TAB		'\t'
@@ -299,12 +311,14 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
 	REQ_(VIEW_HELP,		"Show help page"), \
 	REQ_(VIEW_PAGER,	"Show pager view"), \
 	REQ_(VIEW_STATUS,	"Show status view"), \
+	REQ_(VIEW_STAGE,	"Show stage view"), \
 	\
 	REQ_GROUP("View manipulation") \
 	REQ_(ENTER,		"Enter current line and scroll"), \
 	REQ_(NEXT,		"Move to next"), \
 	REQ_(PREVIOUS,		"Move to previous"), \
 	REQ_(VIEW_NEXT,		"Move focus to next view"), \
+	REQ_(REFRESH,		"Reload and refresh"), \
 	REQ_(VIEW_CLOSE,	"Close the current view"), \
 	REQ_(QUIT,		"Close all views and quit"), \
 	\
@@ -329,7 +343,6 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
 	REQ_(FIND_PREV,		"Find previous search match"), \
 	\
 	REQ_GROUP("Misc") \
-	REQ_(NONE,		"Do nothing"), \
 	REQ_(PROMPT,		"Bring up the prompt"), \
 	REQ_(SCREEN_REDRAW,	"Redraw the screen"), \
 	REQ_(SCREEN_RESIZE,	"Resize the screen"), \
@@ -337,7 +350,10 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
 	REQ_(STOP_LOADING,	"Stop all loading views"), \
 	REQ_(TOGGLE_LINENO,	"Toggle line numbers"), \
 	REQ_(TOGGLE_REV_GRAPH,	"Toggle revision graph visualization"), \
-	REQ_(STATUS_UPDATE,	"Update file status") \
+	REQ_(STATUS_UPDATE,	"Update file status"), \
+	REQ_(STATUS_MERGE,	"Merge file using external tool"), \
+	REQ_(EDIT,		"Open in editor"), \
+	REQ_(NONE,		"Do nothing")
 
 
 /* User action requests. */
@@ -347,8 +363,7 @@ enum request {
 
 	/* Offset all requests to avoid conflicts with ncurses getch values. */
 	REQ_OFFSET = KEY_MAX + 1,
-	REQ_INFO,
-	REQ_UNKNOWN,
+	REQ_INFO
 
 #undef	REQ_GROUP
 #undef	REQ_
@@ -380,7 +395,7 @@ get_request(const char *name)
 		    !string_enum_compare(req_info[i].name, name, namelen))
 			return req_info[i].request;
 
-	return REQ_UNKNOWN;
+	return REQ_NONE;
 }
 
 
@@ -389,7 +404,7 @@ get_request(const char *name)
  */
 
 static const char usage[] =
-"tig " VERSION " (" __DATE__ ")\n"
+"tig " TIG_VERSION " (" __DATE__ ")\n"
 "\n"
 "Usage: tig [options]\n"
 "   or: tig [options] [--] [git log options]\n"
@@ -424,6 +439,8 @@ static iconv_t opt_iconv		= ICONV_NONE;
 static char opt_search[SIZEOF_STR]	= "";
 static char opt_cdup[SIZEOF_STR]	= "";
 static char opt_git_dir[SIZEOF_STR]	= "";
+static char opt_is_inside_work_tree	= -1; /* set to TRUE or FALSE */
+static char opt_editor[SIZEOF_STR]	= "";
 
 enum option_type {
 	OPT_NONE,
@@ -488,6 +505,26 @@ parse_options(int argc, char *argv[])
 		if (opt[0] && opt[0] != '-')
 			break;
 
+		if (!strcmp(opt, "--")) {
+			i++;
+			break;
+		}
+
+		if (check_option(opt, 'v', "version", OPT_NONE)) {
+			printf("tig version %s\n", TIG_VERSION);
+			return FALSE;
+		}
+
+		if (check_option(opt, 'h', "help", OPT_NONE)) {
+			printf(usage);
+			return FALSE;
+		}
+
+		if (!strcmp(opt, "-S")) {
+			opt_request = REQ_VIEW_STATUS;
+			continue;
+		}
+
 		if (!strcmp(opt, "-l")) {
 			opt_request = REQ_VIEW_LOG;
 			continue;
@@ -498,11 +535,6 @@ parse_options(int argc, char *argv[])
 			continue;
 		}
 
-		if (!strcmp(opt, "-S")) {
-			opt_request = REQ_VIEW_STATUS;
-			break;
-		}
-
 		if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) {
 			opt_line_number = TRUE;
 			continue;
@@ -513,21 +545,6 @@ parse_options(int argc, char *argv[])
 			continue;
 		}
 
-		if (check_option(opt, 'v', "version", OPT_NONE)) {
-			printf("tig version %s\n", VERSION);
-			return FALSE;
-		}
-
-		if (check_option(opt, 'h', "help", OPT_NONE)) {
-			printf(usage);
-			return FALSE;
-		}
-
-		if (!strcmp(opt, "--")) {
-			i++;
-			break;
-		}
-
 		die("unknown option '%s'\n\n%s", opt, usage);
 	}
 
@@ -541,7 +558,7 @@ parse_options(int argc, char *argv[])
 		if (opt_request == REQ_VIEW_MAIN)
 			/* XXX: This is vulnerable to the user overriding
 			 * options required for the main view parser. */
-			string_copy(opt_cmd, "git log --pretty=raw");
+			string_copy(opt_cmd, "git log --no-color --pretty=raw");
 		else
 			string_copy(opt_cmd, "git");
 		buf_size = strlen(opt_cmd);
@@ -611,10 +628,10 @@ LINE(MAIN_REMOTE,  "",			COLOR_YELLOW,	COLOR_DEFAULT,	A_BOLD), \
 LINE(MAIN_REF,     "",			COLOR_CYAN,	COLOR_DEFAULT,	A_BOLD), \
 LINE(TREE_DIR,     "",			COLOR_DEFAULT,	COLOR_DEFAULT,	A_NORMAL), \
 LINE(TREE_FILE,    "",			COLOR_DEFAULT,	COLOR_DEFAULT,	A_NORMAL), \
-LINE(STAT_SECTION, "",			COLOR_DEFAULT,	COLOR_BLUE,	A_BOLD), \
+LINE(STAT_SECTION, "",			COLOR_CYAN,	COLOR_DEFAULT,	0), \
 LINE(STAT_NONE,    "",			COLOR_DEFAULT,	COLOR_DEFAULT,	0), \
-LINE(STAT_STAGED,  "",			COLOR_CYAN,	COLOR_DEFAULT,	0), \
-LINE(STAT_UNSTAGED,"",			COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(STAT_STAGED,  "",			COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
+LINE(STAT_UNSTAGED,"",			COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
 LINE(STAT_UNTRACKED,"",			COLOR_MAGENTA,	COLOR_DEFAULT,	0)
 
 enum line_type {
@@ -727,6 +744,7 @@ static struct keybinding default_keybindings[] = {
 	{ 'p',		REQ_VIEW_PAGER },
 	{ 'h',		REQ_VIEW_HELP },
 	{ 'S',		REQ_VIEW_STATUS },
+	{ 'c',		REQ_VIEW_STAGE },
 
 	/* View manipulation */
 	{ 'q',		REQ_VIEW_CLOSE },
@@ -734,6 +752,7 @@ static struct keybinding default_keybindings[] = {
 	{ KEY_RETURN,	REQ_ENTER },
 	{ KEY_UP,	REQ_PREVIOUS },
 	{ KEY_DOWN,	REQ_NEXT },
+	{ 'R',		REQ_REFRESH },
 
 	/* Cursor navigation */
 	{ 'k',		REQ_MOVE_UP },
@@ -767,6 +786,8 @@ static struct keybinding default_keybindings[] = {
 	{ 'g',		REQ_TOGGLE_REV_GRAPH },
 	{ ':',		REQ_PROMPT },
 	{ 'u',		REQ_STATUS_UPDATE },
+	{ 'M',		REQ_STATUS_MERGE },
+	{ 'e',		REQ_EDIT },
 
 	/* Using the ncurses SIGWINCH handler. */
 	{ KEY_RESIZE,	REQ_SCREEN_RESIZE },
@@ -781,7 +802,8 @@ static struct keybinding default_keybindings[] = {
 	KEYMAP_(BLOB), \
 	KEYMAP_(PAGER), \
 	KEYMAP_(HELP), \
-	KEYMAP_(STATUS)
+	KEYMAP_(STATUS), \
+	KEYMAP_(STAGE)
 
 enum keymap {
 #define KEYMAP_(name) KEYMAP_##name
@@ -891,10 +913,30 @@ get_key_value(const char *name)
 }
 
 static char *
+get_key_name(int key_value)
+{
+	static char key_char[] = "'X'";
+	char *seq = NULL;
+	int key;
+
+	for (key = 0; key < ARRAY_SIZE(key_table); key++)
+		if (key_table[key].value == key_value)
+			seq = key_table[key].name;
+
+	if (seq == NULL &&
+	    key_value < 127 &&
+	    isprint(key_value)) {
+		key_char[1] = (char) key_value;
+		seq = key_char;
+	}
+
+	return seq ? seq : "'?'";
+}
+
+static char *
 get_key(enum request request)
 {
 	static char buf[BUFSIZ];
-	static char key_char[] = "'X'";
 	size_t pos = 0;
 	char *sep = "";
 	int i;
@@ -903,27 +945,12 @@ get_key(enum request request)
 
 	for (i = 0; i < ARRAY_SIZE(default_keybindings); i++) {
 		struct keybinding *keybinding = &default_keybindings[i];
-		char *seq = NULL;
-		int key;
 
 		if (keybinding->request != request)
 			continue;
 
-		for (key = 0; key < ARRAY_SIZE(key_table); key++)
-			if (key_table[key].value == keybinding->alias)
-				seq = key_table[key].name;
-
-		if (seq == NULL &&
-		    keybinding->alias < 127 &&
-		    isprint(keybinding->alias)) {
-			key_char[1] = (char) keybinding->alias;
-			seq = key_char;
-		}
-
-		if (!seq)
-			seq = "'?'";
-
-		if (!string_format_from(buf, &pos, "%s%s", sep, seq))
+		if (!string_format_from(buf, &pos, "%s%s", sep,
+					get_key_name(keybinding->alias)))
 			return "Too many keybindings!";
 		sep = ", ";
 	}
@@ -931,6 +958,67 @@ get_key(enum request request)
 	return buf;
 }
 
+struct run_request {
+	enum keymap keymap;
+	int key;
+	char cmd[SIZEOF_STR];
+};
+
+static struct run_request *run_request;
+static size_t run_requests;
+
+static enum request
+add_run_request(enum keymap keymap, int key, int argc, char **argv)
+{
+	struct run_request *tmp;
+	struct run_request req = { keymap, key };
+	size_t bufpos;
+
+	for (bufpos = 0; argc > 0; argc--, argv++)
+		if (!string_format_from(req.cmd, &bufpos, "%s ", *argv))
+			return REQ_NONE;
+
+	req.cmd[bufpos - 1] = 0;
+
+	tmp = realloc(run_request, (run_requests + 1) * sizeof(*run_request));
+	if (!tmp)
+		return REQ_NONE;
+
+	run_request = tmp;
+	run_request[run_requests++] = req;
+
+	return REQ_NONE + run_requests;
+}
+
+static struct run_request *
+get_run_request(enum request request)
+{
+	if (request <= REQ_NONE)
+		return NULL;
+	return &run_request[request - REQ_NONE - 1];
+}
+
+static void
+add_builtin_run_requests(void)
+{
+	struct {
+		enum keymap keymap;
+		int key;
+		char *argv[1];
+	} reqs[] = {
+		{ KEYMAP_MAIN,	  'C', { "git cherry-pick %(commit)" } },
+		{ KEYMAP_GENERIC, 'G', { "git gc" } },
+	};
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(reqs); i++) {
+		enum request req;
+
+		req = add_run_request(reqs[i].keymap, reqs[i].key, 1, reqs[i].argv);
+		if (req != REQ_NONE)
+			add_keybinding(reqs[i].keymap, req, reqs[i].key);
+	}
+}
 
 /*
  * User config file handling.
@@ -1063,7 +1151,7 @@ option_bind_command(int argc, char *argv[])
 	int keymap;
 	int key;
 
-	if (argc != 3) {
+	if (argc < 3) {
 		config_msg = "Wrong number of arguments given to bind command";
 		return ERR;
 	}
@@ -1080,7 +1168,22 @@ option_bind_command(int argc, char *argv[])
 	}
 
 	request = get_request(argv[2]);
-	if (request == REQ_UNKNOWN) {
+	if (request == REQ_NONE) {
+		const char *obsolete[] = { "cherry-pick" };
+		size_t namelen = strlen(argv[2]);
+		int i;
+
+		for (i = 0; i < ARRAY_SIZE(obsolete); i++) {
+			if (namelen == strlen(obsolete[i]) &&
+			    !string_enum_compare(obsolete[i], argv[2], namelen)) {
+				config_msg = "Obsolete request name";
+				return ERR;
+			}
+		}
+	}
+	if (request == REQ_NONE && *argv[2]++ == '!')
+		request = add_run_request(keymap, key, argc - 2, argv + 2);
+	if (request == REQ_NONE) {
 		config_msg = "Unknown request name";
 		return ERR;
 	}
@@ -1100,9 +1203,10 @@ set_option(char *opt, char *value)
 	/* Tokenize */
 	while (argc < ARRAY_SIZE(argv) && (valuelen = strcspn(value, " \t"))) {
 		argv[argc++] = value;
-
 		value += valuelen;
-		if (!*value)
+
+		/* Nothing more to tokenize or last available token. */
+		if (!*value || argc >= ARRAY_SIZE(argv))
 			break;
 
 		*value++ = 0;
@@ -1173,6 +1277,8 @@ load_options(void)
 	config_lineno = 0;
 	config_errors = FALSE;
 
+	add_builtin_run_requests();
+
 	if (!home || !string_format(buf, "%s/.tigrc", home))
 		return ERR;
 
@@ -1263,8 +1369,8 @@ struct view_ops {
 	bool (*read)(struct view *view, char *data);
 	/* Draw one line; @lineno must be < view->height. */
 	bool (*draw)(struct view *view, struct line *line, unsigned int lineno, bool selected);
-	/* Depending on view, change display based on current line. */
-	bool (*enter)(struct view *view, struct line *line);
+	/* Depending on view handle a special requests. */
+	enum request (*request)(struct view *view, enum request request, struct line *line);
 	/* Search for regex in a line. */
 	bool (*grep)(struct view *view, struct line *line);
 	/* Select line */
@@ -1277,6 +1383,7 @@ static struct view_ops tree_ops;
 static struct view_ops blob_ops;
 static struct view_ops help_ops;
 static struct view_ops status_ops;
+static struct view_ops stage_ops;
 
 #define VIEW_STR(name, cmd, env, ref, ops, map) \
 	{ name, cmd, #env, ref, ops, map}
@@ -1294,6 +1401,7 @@ static struct view views[] = {
 	VIEW_(HELP,   "help",   &help_ops,   ""),
 	VIEW_(PAGER,  "pager",  &pager_ops,  "stdin"),
 	VIEW_(STATUS, "status", &status_ops, ""),
+	VIEW_(STAGE,  "stage",	&stage_ops,  ""),
 };
 
 #define VIEW(req) (&views[(req) - REQ_OFFSET - 1])
@@ -1368,7 +1476,7 @@ update_view_title(struct view *view)
 
 	assert(view_is_displayed(view));
 
-	if (!VIEW(REQ_VIEW_STATUS) && (view->lines || view->pipe)) {
+	if (view != VIEW(REQ_VIEW_STATUS) && (view->lines || view->pipe)) {
 		unsigned int view_lines = view->offset + view->height;
 		unsigned int lines = view->lines
 				   ? MIN(view_lines, view->lines) * 100 / view->lines
@@ -1815,7 +1923,10 @@ begin_update(struct view *view)
 		/* When running random commands, initially show the
 		 * command in the title. However, it maybe later be
 		 * overwritten if a commit line is selected. */
-		string_copy(view->ref, view->cmd);
+		if (view == VIEW(REQ_VIEW_PAGER))
+			string_copy(view->ref, view->cmd);
+		else
+			view->ref[0] = 0;
 
 	} else if (view == VIEW(REQ_VIEW_TREE)) {
 		const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt;
@@ -1920,7 +2031,7 @@ update_view(struct view *view)
 			line[linelen - 1] = 0;
 
 		if (opt_iconv != ICONV_NONE) {
-			char *inbuf = line;
+			ICONV_CONST char *inbuf = line;
 			size_t inlen = linelen;
 
 			char *outbuf = out_buffer;
@@ -2117,18 +2228,129 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 		update_view_title(view);
 }
 
+static void
+open_external_viewer(const char *cmd)
+{
+	def_prog_mode();           /* save current tty modes */
+	endwin();                  /* restore original tty modes */
+	system(cmd);
+	fprintf(stderr, "Press Enter to continue");
+	getc(stdin);
+	reset_prog_mode();
+	redraw_display();
+}
+
+static void
+open_mergetool(const char *file)
+{
+	char cmd[SIZEOF_STR];
+	char file_sq[SIZEOF_STR];
+
+	if (sq_quote(file_sq, 0, file) < sizeof(file_sq) &&
+	    string_format(cmd, "git mergetool %s", file_sq)) {
+		open_external_viewer(cmd);
+	}
+}
+
+static void
+open_editor(bool from_root, const 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)
+		editor = opt_editor;
+	if (!editor)
+		editor = getenv("VISUAL");
+	if (!editor)
+		editor = getenv("EDITOR");
+	if (!editor)
+		editor = "vi";
+
+	if (sq_quote(file_sq, 0, file) < sizeof(file_sq) &&
+	    string_format(cmd, "%s %s%s", editor, prefix, file_sq)) {
+		open_external_viewer(cmd);
+	}
+}
+
+static void
+open_run_request(enum request request)
+{
+	struct run_request *req = get_run_request(request);
+	char buf[SIZEOF_STR * 2];
+	size_t bufpos;
+	char *cmd;
+
+	if (!req) {
+		report("Unknown run request");
+		return;
+	}
+
+	bufpos = 0;
+	cmd = req->cmd;
+
+	while (cmd) {
+		char *next = strstr(cmd, "%(");
+		int len = next - cmd;
+		char *value;
+
+		if (!next) {
+			len = strlen(cmd);
+			value = "";
+
+		} else if (!strncmp(next, "%(head)", 7)) {
+			value = ref_head;
+
+		} else if (!strncmp(next, "%(commit)", 9)) {
+			value = ref_commit;
+
+		} else if (!strncmp(next, "%(blob)", 7)) {
+			value = ref_blob;
+
+		} else {
+			report("Unknown replacement in run request: `%s`", req->cmd);
+			return;
+		}
+
+		if (!string_format_from(buf, &bufpos, "%.*s%s", len, cmd, value))
+			return;
+
+		if (next)
+			next = strchr(next, ')') + 1;
+		cmd = next;
+	}
+
+	open_external_viewer(buf);
+}
 
 /*
  * User request switch noodle
  */
 
-static void status_update(struct view *view);
-
 static int
 view_driver(struct view *view, enum request request)
 {
 	int i;
 
+	if (request == REQ_NONE) {
+		doupdate();
+		return TRUE;
+	}
+
+	if (request > REQ_NONE) {
+		open_run_request(request);
+		return TRUE;
+	}
+
+	if (view && view->lines) {
+		request = view->ops->request(view, request, &view->line[view->lineno]);
+		if (request == REQ_NONE)
+			return TRUE;
+	}
+
 	switch (request) {
 	case REQ_MOVE_UP:
 	case REQ_MOVE_DOWN:
@@ -2164,12 +2386,28 @@ view_driver(struct view *view, enum request request)
 		open_view(view, request, OPEN_DEFAULT);
 		break;
 
+	case REQ_VIEW_STAGE:
+		if (!VIEW(REQ_VIEW_STAGE)->lines) {
+			report("No stage content, press %s to open the status view and choose file",
+			       get_key(REQ_VIEW_STATUS));
+			break;
+		}
+		open_view(view, request, OPEN_DEFAULT);
+		break;
+
+	case REQ_VIEW_STATUS:
+		if (opt_is_inside_work_tree == FALSE) {
+			report("The status view requires a working tree");
+			break;
+		}
+		open_view(view, request, OPEN_DEFAULT);
+		break;
+
 	case REQ_VIEW_MAIN:
 	case REQ_VIEW_DIFF:
 	case REQ_VIEW_LOG:
 	case REQ_VIEW_TREE:
 	case REQ_VIEW_HELP:
-	case REQ_VIEW_STATUS:
 		open_view(view, request, OPEN_DEFAULT);
 		break;
 
@@ -2179,6 +2417,8 @@ view_driver(struct view *view, enum request request)
 
 		if ((view == VIEW(REQ_VIEW_DIFF) &&
 		     view->parent == VIEW(REQ_VIEW_MAIN)) ||
+		   (view == VIEW(REQ_VIEW_STAGE) &&
+		     view->parent == VIEW(REQ_VIEW_STATUS)) ||
 		   (view == VIEW(REQ_VIEW_BLOB) &&
 		     view->parent == VIEW(REQ_VIEW_TREE))) {
 			int line;
@@ -2188,20 +2428,14 @@ view_driver(struct view *view, enum request request)
 			move_view(view, request);
 			if (view_is_displayed(view))
 				update_view_title(view);
-			if (line == view->lineno)
-				break;
+			if (line != view->lineno)
+				view->ops->request(view, REQ_ENTER,
+						   &view->line[view->lineno]);
+
 		} else {
 			move_view(view, request);
-			break;
-		}
-		/* Fall-through */
-
-	case REQ_ENTER:
-		if (!view->lines) {
-			report("Nothing to enter");
-			break;
 		}
-		return view->ops->enter(view, &view->line[view->lineno]);
+		break;
 
 	case REQ_VIEW_NEXT:
 	{
@@ -2219,6 +2453,10 @@ view_driver(struct view *view, enum request request)
 		report("");
 		break;
 	}
+	case REQ_REFRESH:
+		report("Refreshing is not yet supported for the %s view", view->name);
+		break;
+
 	case REQ_TOGGLE_LINENO:
 		opt_line_number = !opt_line_number;
 		redraw_display();
@@ -2254,7 +2492,7 @@ view_driver(struct view *view, enum request request)
 		break;
 
 	case REQ_SHOW_VERSION:
-		report("tig-%s (built %s)", VERSION, __DATE__);
+		report("tig-%s (built %s)", TIG_VERSION, __DATE__);
 		return TRUE;
 
 	case REQ_SCREEN_RESIZE:
@@ -2264,13 +2502,15 @@ view_driver(struct view *view, enum request request)
 		redraw_display();
 		break;
 
-	case REQ_STATUS_UPDATE:
-		status_update(view);
+	case REQ_EDIT:
+		report("Nothing to edit");
+		break;
+
+
+	case REQ_ENTER:
+		report("Nothing to enter");
 		break;
 
-	case REQ_NONE:
-		doupdate();
-		return TRUE;
 
 	case REQ_VIEW_CLOSE:
 		/* XXX: Mark closed views by letting view->parent point to the
@@ -2469,11 +2709,14 @@ pager_read(struct view *view, char *data)
 	return TRUE;
 }
 
-static bool
-pager_enter(struct view *view, struct line *line)
+static enum request
+pager_request(struct view *view, enum request request, struct line *line)
 {
 	int split = 0;
 
+	if (request != REQ_ENTER)
+		return request;
+
 	if (line->type == LINE_COMMIT &&
 	   (view == VIEW(REQ_VIEW_LOG) ||
 	    view == VIEW(REQ_VIEW_PAGER))) {
@@ -2492,7 +2735,7 @@ pager_enter(struct view *view, struct line *line)
 	if (split)
 		update_view_title(view);
 
-	return TRUE;
+	return REQ_NONE;
 }
 
 static bool
@@ -2527,7 +2770,7 @@ static struct view_ops pager_ops = {
 	NULL,
 	pager_read,
 	pager_draw,
-	pager_enter,
+	pager_request,
 	pager_grep,
 	pager_select,
 };
@@ -2551,6 +2794,8 @@ help_open(struct view *view)
 		if (!req_info[i].request)
 			lines++;
 
+	lines += run_requests + 1;
+
 	view->line = calloc(lines, sizeof(*view->line));
 	if (!view->line)
 		return FALSE;
@@ -2560,6 +2805,9 @@ help_open(struct view *view)
 	for (i = 0; i < ARRAY_SIZE(req_info); i++) {
 		char *key;
 
+		if (req_info[i].request == REQ_NONE)
+			continue;
+
 		if (!req_info[i].request) {
 			add_line_text(view, "", LINE_DEFAULT);
 			add_line_text(view, req_info[i].help, LINE_DEFAULT);
@@ -2567,12 +2815,39 @@ help_open(struct view *view)
 		}
 
 		key = get_key(req_info[i].request);
+		if (!*key)
+			key = "(no key defined)";
+
 		if (!string_format(buf, "    %-25s %s", key, req_info[i].help))
 			continue;
 
 		add_line_text(view, buf, LINE_DEFAULT);
 	}
 
+	if (run_requests) {
+		add_line_text(view, "", LINE_DEFAULT);
+		add_line_text(view, "External commands:", LINE_DEFAULT);
+	}
+
+	for (i = 0; i < run_requests; i++) {
+		struct run_request *req = get_run_request(REQ_NONE + i + 1);
+		char *key;
+
+		if (!req)
+			continue;
+
+		key = get_key_name(req->key);
+		if (!*key)
+			key = "(no key defined)";
+
+		if (!string_format(buf, "    %-10s %-14s `%s`",
+				   keymap_table[req->keymap].name,
+				   key, req->cmd))
+			continue;
+
+		add_line_text(view, buf, LINE_DEFAULT);
+	}
+
 	return TRUE;
 }
 
@@ -2581,7 +2856,7 @@ static struct view_ops help_ops = {
 	help_open,
 	NULL,
 	pager_draw,
-	pager_enter,
+	pager_request,
 	pager_grep,
 	pager_select,
 };
@@ -2591,6 +2866,50 @@ static struct view_ops help_ops = {
  * Tree backend
  */
 
+struct tree_stack_entry {
+	struct tree_stack_entry *prev;	/* Entry below this in the stack */
+	unsigned long lineno;		/* Line number to restore */
+	char *name;			/* Position of name in opt_path */
+};
+
+/* The top of the path stack. */
+static struct tree_stack_entry *tree_stack = NULL;
+unsigned long tree_lineno = 0;
+
+static void
+pop_tree_stack_entry(void)
+{
+	struct tree_stack_entry *entry = tree_stack;
+
+	tree_lineno = entry->lineno;
+	entry->name[0] = 0;
+	tree_stack = entry->prev;
+	free(entry);
+}
+
+static void
+push_tree_stack_entry(char *name, unsigned long lineno)
+{
+	struct tree_stack_entry *entry = calloc(1, sizeof(*entry));
+	size_t pathlen = strlen(opt_path);
+
+	if (!entry)
+		return;
+
+	entry->prev = tree_stack;
+	entry->name = opt_path + pathlen;
+	tree_stack = entry;
+
+	if (!string_format_from(opt_path, &pathlen, "%s/", name)) {
+		pop_tree_stack_entry();
+		return;
+	}
+
+	/* Move the current line to the first tree entry. */
+	tree_lineno = 1;
+	entry->lineno = lineno;
+}
+
 /* Parse output from git-ls-tree(1):
  *
  * 100644 blob fb0e31ea6cc679b7379631188190e975f5789c26	Makefile
@@ -2687,42 +3006,38 @@ tree_read(struct view *view, char *text)
 	if (!add_line_text(view, text, type))
 		return FALSE;
 
-	/* Move the current line to the first tree entry. */
-	if (first_read)
-		view->lineno++;
+	if (tree_lineno > view->lineno) {
+		view->lineno = tree_lineno;
+		tree_lineno = 0;
+	}
 
 	return TRUE;
 }
 
-static bool
-tree_enter(struct view *view, struct line *line)
+static enum request
+tree_request(struct view *view, enum request request, struct line *line)
 {
 	enum open_flags flags;
-	enum request request;
+
+	if (request != REQ_ENTER)
+		return request;
+
+	/* Cleanup the stack if the tree view is at a different tree. */
+	while (!*opt_path && tree_stack)
+		pop_tree_stack_entry();
 
 	switch (line->type) {
 	case LINE_TREE_DIR:
 		/* Depending on whether it is a subdir or parent (updir?) link
 		 * mangle the path buffer. */
 		if (line == &view->line[1] && *opt_path) {
-			size_t path_len = strlen(opt_path);
-			char *dirsep = opt_path + path_len - 1;
-
-			while (dirsep > opt_path && dirsep[-1] != '/')
-				dirsep--;
-
-			dirsep[0] = 0;
+			pop_tree_stack_entry();
 
 		} else {
-			size_t pathlen = strlen(opt_path);
-			size_t origlen = pathlen;
 			char *data = line->data;
 			char *basename = data + SIZEOF_TREE_ATTR;
 
-			if (!string_format_from(opt_path, &pathlen, "%s/", basename)) {
-				opt_path[origlen] = 0;
-				return TRUE;
-			}
+			push_tree_stack_entry(basename, view->lineno);
 		}
 
 		/* Trees and subtrees share the same ID, so they are not not
@@ -2741,8 +3056,11 @@ tree_enter(struct view *view, struct line *line)
 	}
 
 	open_view(view, request, flags);
+	if (request == REQ_VIEW_TREE) {
+		view->lineno = tree_lineno;
+	}
 
-	return TRUE;
+	return REQ_NONE;
 }
 
 static void
@@ -2765,7 +3083,7 @@ static struct view_ops tree_ops = {
 	NULL,
 	tree_read,
 	pager_draw,
-	tree_enter,
+	tree_request,
 	pager_grep,
 	tree_select,
 };
@@ -2773,7 +3091,7 @@ static struct view_ops tree_ops = {
 static bool
 blob_read(struct view *view, char *line)
 {
-	return add_line_text(view, line, LINE_DEFAULT);
+	return add_line_text(view, line, LINE_DEFAULT) != NULL;
 }
 
 static struct view_ops blob_ops = {
@@ -2781,7 +3099,7 @@ static struct view_ops blob_ops = {
 	NULL,
 	blob_read,
 	pager_draw,
-	pager_enter,
+	pager_request,
 	pager_grep,
 	pager_select,
 };
@@ -2804,6 +3122,9 @@ struct status {
 	char name[SIZEOF_STR];
 };
 
+static struct status stage_status;
+static enum line_type stage_line_type;
+
 /* Get fields from the diff line:
  * :100644 100644 06a5d6ae9eca55be2e0e585a152e6b1336f2b20e 0000000000000000000000000000000000000000 M
  */
@@ -2841,6 +3162,7 @@ static bool
 status_run(struct view *view, const char cmd[], bool diff, enum line_type type)
 {
 	struct status *file = NULL;
+	struct status *unmerged = NULL;
 	char buf[SIZEOF_STR * 4];
 	size_t bufsize = 0;
 	FILE *pipe;
@@ -2890,6 +3212,23 @@ status_run(struct view *view, const char cmd[], bool diff, enum line_type type)
 				if (!sep)
 					break;
 				sepsize = sep - buf + 1;
+
+				/* Collapse all 'M'odified entries that
+				 * follow a associated 'U'nmerged entry.
+				 */
+				if (file->status == 'U') {
+					unmerged = file;
+
+				} else if (unmerged) {
+					int collapse = !strcmp(buf, unmerged->name);
+
+					unmerged = NULL;
+					if (collapse) {
+						free(file);
+						view->lines--;
+						continue;
+					}
+				}
 			}
 
 			/* git-ls-files just delivers a NUL separated
@@ -2915,13 +3254,17 @@ error_out:
 	return TRUE;
 }
 
-#define STATUS_DIFF_INDEX_CMD "git diff-index -z --cached HEAD"
+/* Don't show unmerged entries in the staged section. */
+#define STATUS_DIFF_INDEX_CMD "git diff-index -z --diff-filter=ACDMRTXB --cached HEAD"
 #define STATUS_DIFF_FILES_CMD "git diff-files -z"
 #define STATUS_LIST_OTHER_CMD \
 	"git ls-files -z --others --exclude-per-directory=.gitignore"
 
-#define STATUS_DIFF_SHOW_CMD \
-	"git diff --root --patch-with-stat --find-copies-harder -B -C %s -- %s 2>/dev/null"
+#define STATUS_DIFF_INDEX_SHOW_CMD \
+	"git diff-index --root --patch-with-stat --find-copies-harder -B -C --cached HEAD -- %s 2>/dev/null"
+
+#define STATUS_DIFF_FILES_SHOW_CMD \
+	"git diff-files --root --patch-with-stat --find-copies-harder -B -C -- %s 2>/dev/null"
 
 /* First parse staged info using git-diff-index(1), then parse unstaged
  * info using git-diff-files(1), and finally untracked files using
@@ -2932,12 +3275,13 @@ status_open(struct view *view)
 	struct stat statbuf;
 	char exclude[SIZEOF_STR];
 	char cmd[SIZEOF_STR];
+	unsigned long prev_lineno = view->lineno;
 	size_t i;
 
 	for (i = 0; i < view->lines; i++)
 		free(view->line[i].data);
 	free(view->line);
-	view->lines = view->line_size = 0;
+	view->lines = view->line_size = view->lineno = 0;
 	view->line = NULL;
 
 	if (!realloc_lines(view, view->line_size + 6))
@@ -2961,6 +3305,13 @@ status_open(struct view *view)
 	    !status_run(view, cmd, FALSE, LINE_STAT_UNTRACKED))
 		return FALSE;
 
+	/* If all went well restore the previous line number to stay in
+	 * the context. */
+	if (prev_lineno < view->lines)
+		view->lineno = prev_lineno;
+	else
+		view->lineno = view->lines - 1;
+
 	return TRUE;
 }
 
@@ -3020,7 +3371,7 @@ status_draw(struct view *view, struct line *line, unsigned int lineno, bool sele
 	return TRUE;
 }
 
-static bool
+static enum request
 status_enter(struct view *view, struct line *line)
 {
 	struct status *status = line->data;
@@ -3031,22 +3382,22 @@ status_enter(struct view *view, struct line *line)
 	if (line->type == LINE_STAT_NONE ||
 	    (!status && line[1].type == LINE_STAT_NONE)) {
 		report("No file to diff");
-		return TRUE;
+		return REQ_NONE;
 	}
 
 	if (status && sq_quote(path, 0, status->name) >= sizeof(path))
-		return FALSE;
+		return REQ_QUIT;
 
 	if (opt_cdup[0] &&
 	    line->type != LINE_STAT_UNTRACKED &&
 	    !string_format_from(opt_cmd, &cmdsize, "cd %s;", opt_cdup))
-		return FALSE;
+		return REQ_QUIT;
 
 	switch (line->type) {
 	case LINE_STAT_STAGED:
-		if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD,
-					"--cached", path))
-			return FALSE;
+		if (!string_format_from(opt_cmd, &cmdsize,
+					STATUS_DIFF_INDEX_SHOW_CMD, path))
+			return REQ_QUIT;
 		if (status)
 			info = "Staged changes to %s";
 		else
@@ -3054,9 +3405,9 @@ status_enter(struct view *view, struct line *line)
 		break;
 
 	case LINE_STAT_UNSTAGED:
-		if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD,
-					"", path))
-			return FALSE;
+		if (!string_format_from(opt_cmd, &cmdsize,
+					STATUS_DIFF_FILES_SHOW_CMD, path))
+			return REQ_QUIT;
 		if (status)
 			info = "Unstaged changes to %s";
 		else
@@ -3065,11 +3416,12 @@ status_enter(struct view *view, struct line *line)
 
 	case LINE_STAT_UNTRACKED:
 		if (opt_pipe)
-			return FALSE;
+			return REQ_QUIT;
+
 
 	    	if (!status) {
 			report("No file to show");
-			return TRUE;
+			return REQ_NONE;
 		}
 
 		opt_pipe = fopen(status->name, "r");
@@ -3077,17 +3429,25 @@ status_enter(struct view *view, struct line *line)
 		break;
 
 	default:
-		die("w00t");
+		die("line type %d not handled in switch", line->type);
 	}
 
-	open_view(view, REQ_VIEW_DIFF, OPEN_RELOAD | OPEN_SPLIT);
-	if (view_is_displayed(VIEW(REQ_VIEW_DIFF))) {
-		string_format(VIEW(REQ_VIEW_DIFF)->ref, info, status->name);
+	open_view(view, REQ_VIEW_STAGE, OPEN_RELOAD | OPEN_SPLIT);
+	if (view_is_displayed(VIEW(REQ_VIEW_STAGE))) {
+		if (status) {
+			stage_status = *status;
+		} else {
+			memset(&stage_status, 0, sizeof(stage_status));
+		}
+
+		stage_line_type = line->type;
+		string_format(VIEW(REQ_VIEW_STAGE)->ref, info, stage_status.name);
 	}
 
-	return TRUE;
+	return REQ_NONE;
 }
 
+
 static bool
 status_update_file(struct view *view, struct status *status, enum line_type type)
 {
@@ -3123,7 +3483,7 @@ status_update_file(struct view *view, struct status *status, enum line_type type
 		break;
 
 	default:
-		die("w00t");
+		die("line type %d not handled in switch", type);
 	}
 
 	pipe = popen(cmd, "w");
@@ -3145,31 +3505,69 @@ status_update_file(struct view *view, struct status *status, enum line_type type
 static void
 status_update(struct view *view)
 {
-	if (view == VIEW(REQ_VIEW_STATUS)) {
-		struct line *line = &view->line[view->lineno];
+	struct line *line = &view->line[view->lineno];
 
-		assert(view->lines);
+	assert(view->lines);
 
-		if (!line->data) {
-			while (++line < view->line + view->lines && line->data) {
-				if (!status_update_file(view, line->data, line->type))
-					report("Failed to update file status");
-			}
+	if (!line->data) {
+		while (++line < view->line + view->lines && line->data) {
+			if (!status_update_file(view, line->data, line->type))
+				report("Failed to update file status");
+		}
 
-			if (!line[-1].data) {
-				report("Nothing to update");
-				return;
-			}
+		if (!line[-1].data) {
+			report("Nothing to update");
+			return;
+		}
 
+	} else if (!status_update_file(view, line->data, line->type)) {
+		report("Failed to update file status");
+	}
+}
+
+static enum request
+status_request(struct view *view, enum request request, struct line *line)
+{
+	struct status *status = line->data;
+
+	switch (request) {
+	case REQ_STATUS_UPDATE:
+		status_update(view);
+		break;
 
-		} else if (!status_update_file(view, line->data, line->type)) {
-			report("Failed to update file status");
+	case REQ_STATUS_MERGE:
+		if (!status || status->status != 'U') {
+			report("Merging only possible for files with unmerged status ('U').");
+			return REQ_NONE;
 		}
+		open_mergetool(status->name);
+		break;
 
-		open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD);
-	} else {
-		report("This action is only valid for the status view");
+	case REQ_EDIT:
+		if (!status)
+			return request;
+
+		open_editor(status->status != '?', status->name);
+		break;
+
+	case REQ_ENTER:
+		/* After returning the status view has been split to
+		 * show the stage view. No further reloading is
+		 * necessary. */
+		status_enter(view, line);
+		return REQ_NONE;
+
+	case REQ_REFRESH:
+		/* Simply reload the view. */
+		break;
+
+	default:
+		return request;
 	}
+
+	open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD);
+
+	return REQ_NONE;
 }
 
 static void
@@ -3178,6 +3576,7 @@ status_select(struct view *view, struct line *line)
 	struct status *status = line->data;
 	char file[SIZEOF_STR] = "all files";
 	char *text;
+	char *key;
 
 	if (status && !string_format(file, "'%s'", status->name))
 		return;
@@ -3203,10 +3602,18 @@ status_select(struct view *view, struct line *line)
 		break;
 
 	default:
-		die("w00t");
+		die("line type %d not handled in switch", line->type);
 	}
 
-	string_format(view->ref, text, get_key(REQ_STATUS_UPDATE), file);
+	if (status && status->status == 'U') {
+		text = "Press %s to resolve conflict in %s";
+		key = get_key(REQ_STATUS_MERGE);
+
+	} else {
+		key = get_key(REQ_STATUS_UPDATE);
+	}
+
+	string_format(view->ref, text, key, file);
 }
 
 static bool
@@ -3246,12 +3653,177 @@ static struct view_ops status_ops = {
 	status_open,
 	NULL,
 	status_draw,
-	status_enter,
+	status_request,
 	status_grep,
 	status_select,
 };
 
 
+static bool
+stage_diff_line(FILE *pipe, struct line *line)
+{
+	char *buf = line->data;
+	size_t bufsize = strlen(buf);
+	size_t written = 0;
+
+	while (!ferror(pipe) && written < bufsize) {
+		written += fwrite(buf + written, 1, bufsize - written, pipe);
+	}
+
+	fputc('\n', pipe);
+
+	return written == bufsize;
+}
+
+static struct line *
+stage_diff_hdr(struct view *view, struct line *line)
+{
+	int diff_hdr_dir = line->type == LINE_DIFF_CHUNK ? -1 : 1;
+	struct line *diff_hdr;
+
+	if (line->type == LINE_DIFF_CHUNK)
+		diff_hdr = line - 1;
+	else
+		diff_hdr = view->line + 1;
+
+	while (diff_hdr > view->line && diff_hdr < view->line + view->lines) {
+		if (diff_hdr->type == LINE_DIFF_HEADER)
+			return diff_hdr;
+
+		diff_hdr += diff_hdr_dir;
+	}
+
+	return NULL;
+}
+
+static bool
+stage_update_chunk(struct view *view, struct line *line)
+{
+	char cmd[SIZEOF_STR];
+	size_t cmdsize = 0;
+	struct line *diff_hdr, *diff_chunk, *diff_end;
+	FILE *pipe;
+
+	diff_hdr = stage_diff_hdr(view, line);
+	if (!diff_hdr)
+		return FALSE;
+
+	if (opt_cdup[0] &&
+	    !string_format_from(cmd, &cmdsize, "cd %s;", opt_cdup))
+		return FALSE;
+
+	if (!string_format_from(cmd, &cmdsize,
+				"git apply --cached %s - && "
+				"git update-index -q --unmerged --refresh 2>/dev/null",
+				stage_line_type == LINE_STAT_STAGED ? "-R" : ""))
+		return FALSE;
+
+	pipe = popen(cmd, "w");
+	if (!pipe)
+		return FALSE;
+
+	diff_end = view->line + view->lines;
+	if (line->type != LINE_DIFF_CHUNK) {
+		diff_chunk = diff_hdr;
+
+	} else {
+		for (diff_chunk = line + 1; diff_chunk < diff_end; diff_chunk++)
+			if (diff_chunk->type == LINE_DIFF_CHUNK ||
+			    diff_chunk->type == LINE_DIFF_HEADER)
+				diff_end = diff_chunk;
+
+		diff_chunk = line;
+
+		while (diff_hdr->type != LINE_DIFF_CHUNK) {
+			switch (diff_hdr->type) {
+			case LINE_DIFF_HEADER:
+			case LINE_DIFF_INDEX:
+			case LINE_DIFF_ADD:
+			case LINE_DIFF_DEL:
+				break;
+
+			default:
+				diff_hdr++;
+				continue;
+			}
+
+			if (!stage_diff_line(pipe, diff_hdr++)) {
+				pclose(pipe);
+				return FALSE;
+			}
+		}
+	}
+
+	while (diff_chunk < diff_end && stage_diff_line(pipe, diff_chunk))
+		diff_chunk++;
+
+	pclose(pipe);
+
+	if (diff_chunk != diff_end)
+		return FALSE;
+
+	return TRUE;
+}
+
+static void
+stage_update(struct view *view, struct line *line)
+{
+	if (stage_line_type != LINE_STAT_UNTRACKED &&
+	    (line->type == LINE_DIFF_CHUNK || !stage_status.status)) {
+		if (!stage_update_chunk(view, line)) {
+			report("Failed to apply chunk");
+			return;
+		}
+
+	} else if (!status_update_file(view, &stage_status, stage_line_type)) {
+		report("Failed to update file");
+		return;
+	}
+
+	open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD);
+
+	view = VIEW(REQ_VIEW_STATUS);
+	if (view_is_displayed(view))
+		status_enter(view, &view->line[view->lineno]);
+}
+
+static enum request
+stage_request(struct view *view, enum request request, struct line *line)
+{
+	switch (request) {
+	case REQ_STATUS_UPDATE:
+		stage_update(view, line);
+		break;
+
+	case REQ_EDIT:
+		if (!stage_status.name[0])
+			return request;
+
+		open_editor(stage_status.status != '?', stage_status.name);
+		break;
+
+	case REQ_ENTER:
+		pager_request(view, request, line);
+		break;
+
+	default:
+		return request;
+	}
+
+	return REQ_NONE;
+}
+
+static struct view_ops stage_ops = {
+	"line",
+	NULL,
+	pager_read,
+	pager_draw,
+	stage_request,
+	pager_grep,
+	pager_select,
+};
+
+
 /*
  * Revision graph
  */
@@ -3678,13 +4250,17 @@ main_read(struct view *view, char *line)
 	return TRUE;
 }
 
-static bool
-main_enter(struct view *view, struct line *line)
+static enum request
+main_request(struct view *view, enum request request, struct line *line)
 {
 	enum open_flags flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
 
-	open_view(view, REQ_VIEW_DIFF, flags);
-	return TRUE;
+	if (request == REQ_ENTER)
+		open_view(view, REQ_VIEW_DIFF, flags);
+	else
+		return request;
+
+	return REQ_NONE;
 }
 
 static bool
@@ -3732,7 +4308,7 @@ static struct view_ops main_ops = {
 	NULL,
 	main_read,
 	main_draw,
-	main_enter,
+	main_request,
 	main_grep,
 	main_select,
 };
@@ -3919,6 +4495,21 @@ report(const char *msg, ...)
 	if (input_mode)
 		return;
 
+	if (!view) {
+		char buf[SIZEOF_STR];
+		va_list args;
+
+		va_start(args, msg);
+		if (vsnprintf(buf, sizeof(buf), msg, args) >= sizeof(buf)) {
+			buf[sizeof(buf) - 1] = 0;
+			buf[sizeof(buf) - 2] = '.';
+			buf[sizeof(buf) - 3] = '.';
+			buf[sizeof(buf) - 4] = '.';
+		}
+		va_end(args);
+		die("%s", buf);
+	}
+
 	if (!status_empty || *msg) {
 		va_list args;
 
@@ -4182,23 +4773,37 @@ read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen
 	if (!strcmp(name, "i18n.commitencoding"))
 		string_ncopy(opt_encoding, value, valuelen);
 
+	if (!strcmp(name, "core.editor"))
+		string_ncopy(opt_editor, value, valuelen);
+
 	return OK;
 }
 
 static int
 load_repo_config(void)
 {
-	return read_properties(popen("git repo-config --list", "r"),
+	return read_properties(popen(GIT_CONFIG " --list", "r"),
 			       "=", read_repo_config_option);
 }
 
 static int
 read_repo_info(char *name, size_t namelen, char *value, size_t valuelen)
 {
-	if (!opt_git_dir[0])
+	if (!opt_git_dir[0]) {
 		string_ncopy(opt_git_dir, name, namelen);
-	else
+
+	} else if (opt_is_inside_work_tree == -1) {
+		/* This can be 3 different values depending on the
+		 * version of git being used. If git-rev-parse does not
+		 * understand --is-inside-work-tree it will simply echo
+		 * the option else either "true" or "false" is printed.
+		 * Default to true for the unknown case. */
+		opt_is_inside_work_tree = strcmp(name, "false") ? TRUE : FALSE;
+
+	} else {
 		string_ncopy(opt_cdup, name, namelen);
+	}
+
 	return OK;
 }
 
@@ -4207,7 +4812,7 @@ read_repo_info(char *name, size_t namelen, char *value, size_t valuelen)
 static int
 load_repo_info(void)
 {
-	return read_properties(popen("git rev-parse --git-dir --show-cdup 2>/dev/null", "r"),
+	return read_properties(popen("git rev-parse --git-dir --is-inside-work-tree --show-cdup 2>/dev/null", "r"),
 			       "=", read_repo_info);
 }
 
@@ -4299,10 +4904,6 @@ main(int argc, char *argv[])
 	if (load_repo_info() == ERR)
 		die("Failed to load repo info.");
 
-	/* Require a git repository unless when running in pager mode. */
-	if (!opt_git_dir[0])
-		die("Not a git repository");
-
 	if (load_options() == ERR)
 		die("Failed to load user config.");
 
@@ -4314,6 +4915,10 @@ main(int argc, char *argv[])
 	if (!parse_options(argc, argv))
 		return 0;
 
+	/* Require a git repository unless when running in pager mode. */
+	if (!opt_git_dir[0])
+		die("Not a git repository");
+
 	if (*opt_codeset && strcmp(opt_codeset, opt_encoding)) {
 		opt_iconv = iconv_open(opt_codeset, opt_encoding);
 		if (opt_iconv == ICONV_NONE)