X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/12e8c2be5c217f1be8bfd48cc9723fc696b0fbf6..4ef1bf121de1697c9d54e10addcd34a4d19d3526:/tig.c

diff --git a/tig.c b/tig.c
index 24f84d4..446453d 100644
--- a/tig.c
+++ b/tig.c
@@ -105,13 +105,13 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset,
 	"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 -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"
@@ -318,6 +318,7 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
 	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"), \
 	\
@@ -342,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"), \
@@ -351,8 +351,10 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
 	REQ_(TOGGLE_LINENO,	"Toggle line numbers"), \
 	REQ_(TOGGLE_REV_GRAPH,	"Toggle revision graph visualization"), \
 	REQ_(STATUS_UPDATE,	"Update file status"), \
+	REQ_(STATUS_MERGE,	"Merge file using external tool"), \
+	REQ_(TREE_PARENT,	"Switch to parent directory in tree view"), \
 	REQ_(EDIT,		"Open in editor"), \
-	REQ_(CHERRY_PICK,	"Cherry-pick commit to current branch")
+	REQ_(NONE,		"Do nothing")
 
 
 /* User action requests. */
@@ -362,8 +364,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_
@@ -395,7 +396,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;
 }
 
 
@@ -439,6 +440,7 @@ 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 {
@@ -504,6 +506,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;
@@ -514,11 +536,6 @@ parse_options(int argc, char *argv[])
 			continue;
 		}
 
-		if (!strcmp(opt, "-S")) {
-			opt_request = REQ_VIEW_STATUS;
-			continue;
-		}
-
 		if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) {
 			opt_line_number = TRUE;
 			continue;
@@ -529,21 +546,6 @@ parse_options(int argc, char *argv[])
 			continue;
 		}
 
-		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, "--")) {
-			i++;
-			break;
-		}
-
 		die("unknown option '%s'\n\n%s", opt, usage);
 	}
 
@@ -557,7 +559,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);
@@ -625,6 +627,7 @@ LINE(MAIN_DELIM,   "",			COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
 LINE(MAIN_TAG,     "",			COLOR_MAGENTA,	COLOR_DEFAULT,	A_BOLD), \
 LINE(MAIN_REMOTE,  "",			COLOR_YELLOW,	COLOR_DEFAULT,	A_BOLD), \
 LINE(MAIN_REF,     "",			COLOR_CYAN,	COLOR_DEFAULT,	A_BOLD), \
+LINE(MAIN_REVGRAPH,"",			COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
 LINE(TREE_DIR,     "",			COLOR_DEFAULT,	COLOR_DEFAULT,	A_NORMAL), \
 LINE(TREE_FILE,    "",			COLOR_DEFAULT,	COLOR_DEFAULT,	A_NORMAL), \
 LINE(STAT_SECTION, "",			COLOR_CYAN,	COLOR_DEFAULT,	0), \
@@ -751,6 +754,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 },
@@ -784,8 +788,9 @@ static struct keybinding default_keybindings[] = {
 	{ 'g',		REQ_TOGGLE_REV_GRAPH },
 	{ ':',		REQ_PROMPT },
 	{ 'u',		REQ_STATUS_UPDATE },
+	{ 'M',		REQ_STATUS_MERGE },
+	{ ',',		REQ_TREE_PARENT },
 	{ 'e',		REQ_EDIT },
-	{ 'C',		REQ_CHERRY_PICK },
 
 	/* Using the ncurses SIGWINCH handler. */
 	{ KEY_RESIZE,	REQ_SCREEN_RESIZE },
@@ -911,10 +916,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;
@@ -923,27 +948,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 = ", ";
 	}
@@ -951,6 +961,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.
@@ -1083,7 +1154,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;
 	}
@@ -1100,7 +1171,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;
 	}
@@ -1120,9 +1206,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;
@@ -1193,6 +1280,8 @@ load_options(void)
 	config_lineno = 0;
 	config_errors = FALSE;
 
+	add_builtin_run_requests();
+
 	if (!home || !string_format(buf, "%s/.tigrc", home))
 		return ERR;
 
@@ -2143,7 +2232,31 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 }
 
 static void
-open_editor(struct view *view, bool from_root, char *file)
+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];
@@ -2162,12 +2275,58 @@ open_editor(struct view *view, bool from_root, char *file)
 
 	if (sq_quote(file_sq, 0, file) < sizeof(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);
-		reset_prog_mode();
-		redraw_display();
+		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);
 }
 
 /*
@@ -2184,6 +2343,11 @@ view_driver(struct view *view, enum request request)
 		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)
@@ -2234,12 +2398,19 @@ view_driver(struct view *view, enum request request)
 		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;
 
@@ -2285,6 +2456,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();
@@ -2334,9 +2509,6 @@ view_driver(struct view *view, enum request request)
 		report("Nothing to edit");
 		break;
 
-	case REQ_CHERRY_PICK:
-		report("Nothing to cherry-pick");
-		break;
 
 	case REQ_ENTER:
 		report("Nothing to enter");
@@ -2625,6 +2797,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;
@@ -2634,6 +2808,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);
@@ -2641,12 +2818,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;
 }
 
@@ -2818,6 +3022,16 @@ tree_request(struct view *view, enum request request, struct line *line)
 {
 	enum open_flags flags;
 
+	if (request == REQ_TREE_PARENT) {
+		if (*opt_path) {
+			/* fake 'cd  ..' */
+			request = REQ_ENTER;
+			line = &view->line[1];
+		} else {
+			/* quit view if at top of tree */
+			return REQ_VIEW_CLOSE;
+		}
+	}
 	if (request != REQ_ENTER)
 		return request;
 
@@ -2961,6 +3175,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;
@@ -3010,6 +3225,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
@@ -3035,13 +3267,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 -C --cached HEAD -- %s 2>/dev/null"
+
+#define STATUS_DIFF_FILES_SHOW_CMD \
+	"git diff-files --root --patch-with-stat --find-copies-harder -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
@@ -3055,7 +3291,6 @@ status_open(struct view *view)
 	unsigned long prev_lineno = view->lineno;
 	size_t i;
 
-
 	for (i = 0; i < view->lines; i++)
 		free(view->line[i].data);
 	free(view->line);
@@ -3173,8 +3408,8 @@ status_enter(struct view *view, struct line *line)
 
 	switch (line->type) {
 	case LINE_STAT_STAGED:
-		if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD,
-					"--cached", path))
+		if (!string_format_from(opt_cmd, &cmdsize,
+					STATUS_DIFF_INDEX_SHOW_CMD, path))
 			return REQ_QUIT;
 		if (status)
 			info = "Staged changes to %s";
@@ -3183,8 +3418,8 @@ 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))
+		if (!string_format_from(opt_cmd, &cmdsize,
+					STATUS_DIFF_FILES_SHOW_CMD, path))
 			return REQ_QUIT;
 		if (status)
 			info = "Unstaged changes to %s";
@@ -3207,7 +3442,7 @@ 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_STAGE, OPEN_RELOAD | OPEN_SPLIT);
@@ -3261,7 +3496,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");
@@ -3301,8 +3536,6 @@ status_update(struct view *view)
 	} else if (!status_update_file(view, line->data, line->type)) {
 		report("Failed to update file status");
 	}
-
-	open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD);
 }
 
 static enum request
@@ -3315,21 +3548,38 @@ status_request(struct view *view, enum request request, struct line *line)
 		status_update(view);
 		break;
 
+	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;
+
 	case REQ_EDIT:
 		if (!status)
 			return request;
 
-		open_editor(view, status->status != '?', status->name);
+		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;
 }
 
@@ -3339,6 +3589,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;
@@ -3364,10 +3615,18 @@ status_select(struct view *view, struct line *line)
 		break;
 
 	default:
-		die("w00t");
+		die("line type %d not handled in switch", line->type);
+	}
+
+	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, get_key(REQ_STATUS_UPDATE), file);
+	string_format(view->ref, text, key, file);
 }
 
 static bool
@@ -3553,7 +3812,7 @@ stage_request(struct view *view, enum request request, struct line *line)
 		if (!stage_status.name[0])
 			return request;
 
-		open_editor(view, stage_status.status != '?', stage_status.name);
+		open_editor(stage_status.status != '?', stage_status.name);
 		break;
 
 	case REQ_ENTER:
@@ -3839,12 +4098,12 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
 	}
 
 	col += AUTHOR_COLS;
-	if (type != LINE_CURSOR)
-		wattrset(view->win, A_NORMAL);
 
 	if (opt_rev_graph && commit->graph_size) {
 		size_t i;
 
+		if (type != LINE_CURSOR)
+			wattrset(view->win, get_line_attr(LINE_MAIN_REVGRAPH));
 		wmove(view->win, lineno, col);
 		/* Using waddch() instead of waddnstr() ensures that
 		 * they'll be rendered correctly for the cursor line. */
@@ -3854,6 +4113,8 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
 		waddch(view->win, ' ');
 		col += commit->graph_size + 1;
 	}
+	if (type != LINE_CURSOR)
+		wattrset(view->win, A_NORMAL);
 
 	wmove(view->win, lineno, col);
 
@@ -4004,26 +4265,6 @@ main_read(struct view *view, char *line)
 	return TRUE;
 }
 
-static void
-cherry_pick_commit(struct commit *commit)
-{
-	char cmd[SIZEOF_STR];
-	char *cherry_pick = getenv("TIG_CHERRY_PICK");
-
-	if (!cherry_pick)
-		cherry_pick = "git cherry-pick";
-
-	if (string_format(cmd, "%s %s", cherry_pick, commit->id)) {
-		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 enum request
 main_request(struct view *view, enum request request, struct line *line)
 {
@@ -4031,8 +4272,6 @@ main_request(struct view *view, enum request request, struct line *line)
 
 	if (request == REQ_ENTER)
 		open_view(view, REQ_VIEW_DIFF, flags);
-	else if (request == REQ_CHERRY_PICK)
-		cherry_pick_commit(line->data);
 	else
 		return request;
 
@@ -4271,6 +4510,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;
 
@@ -4550,10 +4804,21 @@ load_repo_config(void)
 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;
 }
 
@@ -4562,7 +4827,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);
 }