X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/ec31d0d018f14973d7d91084a3582f8bfd53b0ef..a00fff3cc7b71eb6b75ef38e6fe7de060921f53f:/tig.c

diff --git a/tig.c b/tig.c
index 1ad9264..8fb2d4c 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,6 +11,10 @@
  * GNU General Public License for more details.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifndef TIG_VERSION
 #define TIG_VERSION "unknown-version"
 #endif
@@ -38,9 +42,10 @@
 #include <langinfo.h>
 #include <iconv.h>
 
-#include <curses.h>
+/* ncurses(3): Must be defined to have extended wide-character functions. */
+#define _XOPEN_SOURCE_EXTENDED
 
-#include "config.h"
+#include <curses.h>
 
 #if __GNUC__ >= 3
 #define __NORETURN __attribute__((__noreturn__))
@@ -49,10 +54,11 @@
 #endif
 
 static void __NORETURN die(const char *err, ...);
+static void warn(const char *msg, ...);
 static void report(const char *msg, ...);
 static int read_properties(FILE *pipe, const char *separators, int (*read)(char *, size_t, char *, size_t));
 static void set_nonblocking_input(bool loading);
-static size_t utf8_length(const char *string, size_t max_width, int *coloffset, int *trimmed);
+static size_t utf8_length(const char *string, size_t max_width, int *trimmed, bool reserve);
 
 #define ABS(x)		((x) >= 0  ? (x) : -(x))
 #define MIN(x, y)	((x) < (y) ? (x) :  (y))
@@ -70,6 +76,7 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset,
 #define REVGRAPH_MERGE	'M'
 #define REVGRAPH_BRANCH	'+'
 #define REVGRAPH_COMMIT	'*'
+#define REVGRAPH_BOUND	'^'
 #define REVGRAPH_LINE	'|'
 
 #define SIZEOF_REVGRAPH	19	/* Size of revision ancestry graphics. */
@@ -78,6 +85,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"
@@ -92,17 +102,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 --pretty=fuller --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 --parents --boundary --pretty=raw %s 2>/dev/null"
 
 #define TIG_TREE_CMD	\
 	"git ls-tree %s %s"
@@ -114,6 +128,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'
@@ -125,6 +140,7 @@ struct ref {
 	char *name;		/* Ref name; tag or head names are shortened. */
 	char id[SIZEOF_REV];	/* Commit SHA1 ID */
 	unsigned int tag:1;	/* Is it a tag? */
+	unsigned int ltag:1;	/* If so, is the tag local? */
 	unsigned int remote:1;	/* Is it a remote ref? */
 	unsigned int next:1;	/* For ref lists: are there more refs? */
 };
@@ -301,12 +317,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"), \
 	\
@@ -331,16 +349,21 @@ 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"), \
 	REQ_(SHOW_VERSION,	"Show version information"), \
 	REQ_(STOP_LOADING,	"Stop all loading views"), \
 	REQ_(TOGGLE_LINENO,	"Toggle line numbers"), \
+	REQ_(TOGGLE_DATE,	"Toggle date display"), \
+	REQ_(TOGGLE_AUTHOR,	"Toggle author display"), \
 	REQ_(TOGGLE_REV_GRAPH,	"Toggle revision graph visualization"), \
+	REQ_(TOGGLE_REFS,	"Toggle reference display (tags/branches)"), \
 	REQ_(STATUS_UPDATE,	"Update file status"), \
-	REQ_(EDIT,		"Open in editor")
+	REQ_(STATUS_MERGE,	"Merge file using external tool"), \
+	REQ_(TREE_PARENT,	"Switch to parent directory in tree view"), \
+	REQ_(EDIT,		"Open in editor"), \
+	REQ_(NONE,		"Do nothing")
 
 
 /* User action requests. */
@@ -350,8 +373,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_
@@ -383,7 +405,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;
 }
 
 
@@ -394,26 +416,21 @@ get_request(const char *name)
 static const char usage[] =
 "tig " TIG_VERSION " (" __DATE__ ")\n"
 "\n"
-"Usage: tig [options]\n"
-"   or: tig [options] [--] [git log options]\n"
-"   or: tig [options] log  [git log options]\n"
-"   or: tig [options] diff [git diff options]\n"
-"   or: tig [options] show [git show options]\n"
-"   or: tig [options] <    [git command output]\n"
+"Usage: tig        [options] [revs] [--] [paths]\n"
+"   or: tig show   [options] [revs] [--] [paths]\n"
+"   or: tig status\n"
+"   or: tig <      [git command output]\n"
 "\n"
 "Options:\n"
-"  -l                          Start up in log view\n"
-"  -d                          Start up in diff view\n"
-"  -S                          Start up in status view\n"
-"  -n[I], --line-number[=I]    Show line numbers with given interval\n"
-"  -b[N], --tab-size[=N]       Set number of spaces for tab expansion\n"
-"  --                          Mark end of tig options\n"
-"  -v, --version               Show version and exit\n"
-"  -h, --help                  Show help message and exit\n";
+"  -v, --version   Show version and exit\n"
+"  -h, --help      Show help message and exit\n";
 
 /* Option and state variables. */
+static bool opt_date			= TRUE;
+static bool opt_author			= TRUE;
 static bool opt_line_number		= FALSE;
 static bool opt_rev_graph		= FALSE;
+static bool opt_show_refs		= TRUE;
 static int opt_num_interval		= NUMBER_INTERVAL;
 static int opt_tab_size			= TABSIZE;
 static enum request opt_request		= REQ_VIEW_MAIN;
@@ -427,6 +444,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 signed char opt_is_inside_work_tree	= -1; /* set to TRUE or FALSE */
 static char opt_editor[SIZEOF_STR]	= "";
 
 enum option_type {
@@ -476,45 +494,41 @@ check_option(char *opt, char short_name, char *name, enum option_type type, ...)
 static bool
 parse_options(int argc, char *argv[])
 {
+	char *altargv[1024];
+	int altargc = 0;
+	char *subcommand = NULL;
 	int i;
 
 	for (i = 1; i < argc; i++) {
 		char *opt = argv[i];
 
 		if (!strcmp(opt, "log") ||
-		    !strcmp(opt, "diff") ||
-		    !strcmp(opt, "show")) {
+		    !strcmp(opt, "diff")) {
+			subcommand = opt;
 			opt_request = opt[0] == 'l'
 				    ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
+			warn("`tig %s' has been deprecated", opt);
 			break;
 		}
 
-		if (opt[0] && opt[0] != '-')
-			break;
-
-		if (!strcmp(opt, "-l")) {
-			opt_request = REQ_VIEW_LOG;
-			continue;
-		}
-
-		if (!strcmp(opt, "-d")) {
+		if (!strcmp(opt, "show")) {
+			subcommand = opt;
 			opt_request = REQ_VIEW_DIFF;
-			continue;
+			break;
 		}
 
-		if (!strcmp(opt, "-S")) {
+		if (!strcmp(opt, "status")) {
+			subcommand = opt;
 			opt_request = REQ_VIEW_STATUS;
-			continue;
+			break;
 		}
 
-		if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) {
-			opt_line_number = TRUE;
-			continue;
-		}
+		if (opt[0] && opt[0] != '-')
+			break;
 
-		if (check_option(opt, 'b', "tab-size", OPT_INT, &opt_tab_size)) {
-			opt_tab_size = MIN(opt_tab_size, TABSIZE);
-			continue;
+		if (!strcmp(opt, "--")) {
+			i++;
+			break;
 		}
 
 		if (check_option(opt, 'v', "version", OPT_NONE)) {
@@ -527,29 +541,59 @@ parse_options(int argc, char *argv[])
 			return FALSE;
 		}
 
-		if (!strcmp(opt, "--")) {
-			i++;
-			break;
+		if (!strcmp(opt, "-S")) {
+			warn("`%s' has been deprecated; use `tig status' instead", opt);
+			opt_request = REQ_VIEW_STATUS;
+			continue;
 		}
 
-		die("unknown option '%s'\n\n%s", opt, usage);
+		if (!strcmp(opt, "-l")) {
+			opt_request = REQ_VIEW_LOG;
+		} else if (!strcmp(opt, "-d")) {
+			opt_request = REQ_VIEW_DIFF;
+		} else if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) {
+			opt_line_number = TRUE;
+		} else if (check_option(opt, 'b', "tab-size", OPT_INT, &opt_tab_size)) {
+			opt_tab_size = MIN(opt_tab_size, TABSIZE);
+		} else {
+			if (altargc >= ARRAY_SIZE(altargv))
+				die("maximum number of arguments exceeded");
+			altargv[altargc++] = opt;
+			continue;
+		}
+
+		warn("`%s' has been deprecated", opt);
 	}
 
+	/* Check that no 'alt' arguments occured before a subcommand. */
+	if (subcommand && i < argc && altargc > 0)
+		die("unknown arguments before `%s'", argv[i]);
+
 	if (!isatty(STDIN_FILENO)) {
 		opt_request = REQ_VIEW_PAGER;
 		opt_pipe = stdin;
 
-	} else if (i < argc) {
+	} else if (opt_request == REQ_VIEW_STATUS) {
+		if (argc - i > 1)
+			warn("ignoring arguments after `%s'", argv[i]);
+
+	} else if (i < argc || altargc > 0) {
+		int alti = 0;
 		size_t buf_size;
 
 		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 --boundary --parents");
 		else
 			string_copy(opt_cmd, "git");
 		buf_size = strlen(opt_cmd);
 
+		while (buf_size < sizeof(opt_cmd) && alti < altargc) {
+			opt_cmd[buf_size++] = ' ';
+			buf_size = sq_quote(opt_cmd, buf_size, altargv[alti++]);
+		}
+
 		while (buf_size < sizeof(opt_cmd) && i < argc) {
 			opt_cmd[buf_size++] = ' ';
 			buf_size = sq_quote(opt_cmd, buf_size, argv[i++]);
@@ -561,9 +605,6 @@ parse_options(int argc, char *argv[])
 		opt_cmd[buf_size] = 0;
 	}
 
-	if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8"))
-		opt_utf8 = FALSE;
-
 	return TRUE;
 }
 
@@ -611,14 +652,16 @@ LINE(MAIN_AUTHOR,  "",			COLOR_GREEN,	COLOR_DEFAULT,	0), \
 LINE(MAIN_COMMIT,  "",			COLOR_DEFAULT,	COLOR_DEFAULT,	0), \
 LINE(MAIN_DELIM,   "",			COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
 LINE(MAIN_TAG,     "",			COLOR_MAGENTA,	COLOR_DEFAULT,	A_BOLD), \
+LINE(MAIN_LOCAL_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_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 {
@@ -681,15 +724,15 @@ get_line_info(char *name, int namelen)
 static void
 init_colors(void)
 {
-	int default_bg = COLOR_BLACK;
-	int default_fg = COLOR_WHITE;
+	int default_bg = line_info[LINE_DEFAULT].bg;
+	int default_fg = line_info[LINE_DEFAULT].fg;
 	enum line_type type;
 
 	start_color();
 
-	if (use_default_colors() != ERR) {
-		default_bg = -1;
-		default_fg = -1;
+	if (assume_default_colors(default_fg, default_bg) == ERR) {
+		default_bg = COLOR_BLACK;
+		default_fg = COLOR_WHITE;
 	}
 
 	for (type = 0; type < ARRAY_SIZE(line_info); type++) {
@@ -731,6 +774,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 },
@@ -738,6 +782,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 },
@@ -768,9 +813,14 @@ static struct keybinding default_keybindings[] = {
 	{ 'v',		REQ_SHOW_VERSION },
 	{ 'r',		REQ_SCREEN_REDRAW },
 	{ '.',		REQ_TOGGLE_LINENO },
+	{ 'D',		REQ_TOGGLE_DATE },
+	{ 'A',		REQ_TOGGLE_AUTHOR },
 	{ 'g',		REQ_TOGGLE_REV_GRAPH },
+	{ 'F',		REQ_TOGGLE_REFS },
 	{ ':',		REQ_PROMPT },
 	{ 'u',		REQ_STATUS_UPDATE },
+	{ 'M',		REQ_STATUS_MERGE },
+	{ ',',		REQ_TREE_PARENT },
 	{ 'e',		REQ_EDIT },
 
 	/* Using the ncurses SIGWINCH handler. */
@@ -786,7 +836,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
@@ -896,10 +947,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;
@@ -908,27 +979,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 = ", ";
 	}
@@ -936,6 +992,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.
@@ -1006,6 +1123,12 @@ option_color_command(int argc, char *argv[])
 	return OK;
 }
 
+static bool parse_bool(const char *s)
+{
+	return (!strcmp(s, "1") || !strcmp(s, "true") ||
+		!strcmp(s, "yes")) ? TRUE : FALSE;
+}
+
 /* Wants: name = value */
 static int
 option_set_command(int argc, char *argv[])
@@ -1020,10 +1143,28 @@ option_set_command(int argc, char *argv[])
 		return ERR;
 	}
 
+	if (!strcmp(argv[0], "show-author")) {
+		opt_author = parse_bool(argv[2]);
+		return OK;
+	}
+
+	if (!strcmp(argv[0], "show-date")) {
+		opt_date = parse_bool(argv[2]);
+		return OK;
+	}
+
 	if (!strcmp(argv[0], "show-rev-graph")) {
-		opt_rev_graph = (!strcmp(argv[2], "1") ||
-				 !strcmp(argv[2], "true") ||
-				 !strcmp(argv[2], "yes"));
+		opt_rev_graph = parse_bool(argv[2]);
+		return OK;
+	}
+
+	if (!strcmp(argv[0], "show-refs")) {
+		opt_show_refs = parse_bool(argv[2]);
+		return OK;
+	}
+
+	if (!strcmp(argv[0], "show-line-numbers")) {
+		opt_line_number = parse_bool(argv[2]);
 		return OK;
 	}
 
@@ -1068,7 +1209,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;
 	}
@@ -1085,7 +1226,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;
 	}
@@ -1105,9 +1261,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;
@@ -1168,27 +1325,47 @@ read_option(char *opt, size_t optlen, char *value, size_t valuelen)
 	return OK;
 }
 
-static int
-load_options(void)
+static void
+load_option_file(const char *path)
 {
-	char *home = getenv("HOME");
-	char buf[SIZEOF_STR];
 	FILE *file;
 
-	config_lineno = 0;
-	config_errors = FALSE;
-
-	if (!home || !string_format(buf, "%s/.tigrc", home))
-		return ERR;
-
 	/* It's ok that the file doesn't exist. */
-	file = fopen(buf, "r");
+	file = fopen(path, "r");
 	if (!file)
-		return OK;
+		return;
+
+	config_lineno = 0;
+	config_errors = FALSE;
 
 	if (read_properties(file, " \t", read_option) == ERR ||
 	    config_errors == TRUE)
-		fprintf(stderr, "Errors while loading %s.\n", buf);
+		fprintf(stderr, "Errors while loading %s.\n", path);
+}
+
+static int
+load_options(void)
+{
+	char *home = getenv("HOME");
+	char *tigrc_user = getenv("TIGRC_USER");
+	char *tigrc_system = getenv("TIGRC_SYSTEM");
+	char buf[SIZEOF_STR];
+
+	add_builtin_run_requests();
+
+	if (!tigrc_system) {
+		if (!string_format(buf, "%s/tigrc", SYSCONFDIR))
+			return ERR;
+		tigrc_system = buf;
+	}
+	load_option_file(tigrc_system);
+
+	if (!tigrc_user) {
+		if (!home || !string_format(buf, "%s/.tigrc", home))
+			return ERR;
+		tigrc_user = buf;
+	}
+	load_option_file(tigrc_user);
 
 	return OK;
 }
@@ -1249,9 +1426,10 @@ struct view {
 	struct view *parent;
 
 	/* Buffering */
-	unsigned long lines;	/* Total number of lines */
+	size_t lines;		/* Total number of lines */
 	struct line *line;	/* Line index */
-	unsigned long line_size;/* Total number of allocated lines */
+	size_t line_alloc;	/* Total number of allocated lines */
+	size_t line_size;	/* Total number of used lines */
 	unsigned int digits;	/* Number of digits in the lines member. */
 
 	/* Loading */
@@ -1282,6 +1460,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}
@@ -1299,6 +1478,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])
@@ -1309,6 +1489,40 @@ static struct view views[] = {
 #define view_is_displayed(view) \
 	(view == display[0] || view == display[1])
 
+static int
+draw_text(struct view *view, const char *string, int max_len,
+	  bool use_tilde, int tilde_attr)
+{
+	int len = 0;
+	int trimmed = FALSE;
+
+	if (max_len <= 0)
+		return 0;
+
+	if (opt_utf8) {
+		len = utf8_length(string, max_len, &trimmed, use_tilde);
+	} else {
+		len = strlen(string);
+		if (len > max_len) {
+			if (use_tilde) {
+				max_len -= 1;
+			}
+			len = max_len;
+			trimmed = TRUE;
+		}
+	}
+
+	waddnstr(view->win, string, len);
+	if (trimmed && use_tilde) {
+		if (tilde_attr != -1)
+			wattrset(view->win, tilde_attr);
+		waddch(view->win, '~');
+		len++;
+	}
+
+	return len;
+}
+
 static bool
 draw_view_line(struct view *view, unsigned int lineno)
 {
@@ -1885,15 +2099,33 @@ begin_update(struct view *view)
 	return TRUE;
 }
 
+#define ITEM_CHUNK_SIZE 256
+static void *
+realloc_items(void *mem, size_t *size, size_t new_size, size_t item_size)
+{
+	size_t num_chunks = *size / ITEM_CHUNK_SIZE;
+	size_t num_chunks_new = (new_size + ITEM_CHUNK_SIZE - 1) / ITEM_CHUNK_SIZE;
+
+	if (mem == NULL || num_chunks != num_chunks_new) {
+		*size = num_chunks_new * ITEM_CHUNK_SIZE;
+		mem = realloc(mem, *size * item_size);
+	}
+
+	return mem;
+}
+
 static struct line *
 realloc_lines(struct view *view, size_t line_size)
 {
-	struct line *tmp = realloc(view->line, sizeof(*view->line) * line_size);
+	size_t alloc = view->line_alloc;
+	struct line *tmp = realloc_items(view->line, &alloc, line_size,
+					 sizeof(*view->line));
 
 	if (!tmp)
 		return NULL;
 
 	view->line = tmp;
+	view->line_alloc = alloc;
 	view->line_size = line_size;
 	return view->line;
 }
@@ -1928,7 +2160,7 @@ update_view(struct view *view)
 			line[linelen - 1] = 0;
 
 		if (opt_iconv != ICONV_NONE) {
-			ICONV_INBUF_TYPE inbuf = line;
+			ICONV_CONST char *inbuf = line;
 			size_t inlen = linelen;
 
 			char *outbuf = out_buffer;
@@ -2126,11 +2358,36 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 }
 
 static void
-open_editor(struct view *view, 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];
 	char *editor;
+	char *prefix = from_root ? opt_cdup : "";
 
 	editor = getenv("GIT_EDITOR");
 	if (!editor && *opt_editor)
@@ -2143,15 +2400,61 @@ 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)) {
-		def_prog_mode();           /* save current tty modes */
-		endwin();                  /* restore original tty modes */
-		system(cmd);
-		reset_prog_mode();
-		redraw_display();
+	    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
  */
@@ -2161,6 +2464,16 @@ 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)
@@ -2202,12 +2515,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;
 
@@ -2217,7 +2546,7 @@ view_driver(struct view *view, enum request request)
 
 		if ((view == VIEW(REQ_VIEW_DIFF) &&
 		     view->parent == VIEW(REQ_VIEW_MAIN)) ||
-		   (view == VIEW(REQ_VIEW_DIFF) &&
+		   (view == VIEW(REQ_VIEW_STAGE) &&
 		     view->parent == VIEW(REQ_VIEW_STATUS)) ||
 		   (view == VIEW(REQ_VIEW_BLOB) &&
 		     view->parent == VIEW(REQ_VIEW_TREE))) {
@@ -2253,16 +2582,35 @@ 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();
 		break;
 
+	case REQ_TOGGLE_DATE:
+		opt_date = !opt_date;
+		redraw_display();
+		break;
+
+	case REQ_TOGGLE_AUTHOR:
+		opt_author = !opt_author;
+		redraw_display();
+		break;
+
 	case REQ_TOGGLE_REV_GRAPH:
 		opt_rev_graph = !opt_rev_graph;
 		redraw_display();
 		break;
 
+	case REQ_TOGGLE_REFS:
+		opt_show_refs = !opt_show_refs;
+		redraw_display();
+		break;
+
 	case REQ_PROMPT:
 		/* Always reload^Wrerun commands from the prompt. */
 		open_view(view, opt_request, OPEN_RELOAD);
@@ -2302,13 +2650,11 @@ view_driver(struct view *view, enum request request)
 		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
@@ -2347,7 +2693,6 @@ pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selec
 {
 	char *text = line->data;
 	enum line_type type = line->type;
-	int textlen = strlen(text);
 	int attr;
 
 	wmove(view->win, lineno, 0);
@@ -2400,13 +2745,9 @@ pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selec
 		}
 
 	} else {
-		int col = 0, pos = 0;
-
-		for (; pos < textlen && col < view->width; pos++, col++)
-			if (text[pos] == '\t')
-				col += TABSIZE - (col % TABSIZE) - 1;
+		int tilde_attr = get_line_attr(LINE_MAIN_DELIM);
 
-		waddnstr(view->win, text, pos);
+		draw_text(view, text, view->width, TRUE, tilde_attr);
 	}
 
 	return TRUE;
@@ -2444,7 +2785,7 @@ static void
 add_pager_refs(struct view *view, struct line *line)
 {
 	char buf[SIZEOF_STR];
-	char *commit_id = line->data + STRING_SIZE("commit ");
+	char *commit_id = (char *)line->data + STRING_SIZE("commit ");
 	struct ref **refs;
 	size_t bufpos = 0, refpos = 0;
 	const char *sep = "Refs: ";
@@ -2555,7 +2896,7 @@ static void
 pager_select(struct view *view, struct line *line)
 {
 	if (line->type == LINE_COMMIT) {
-		char *text = line->data + STRING_SIZE("commit ");
+		char *text = (char *)line->data + STRING_SIZE("commit ");
 
 		if (view != VIEW(REQ_VIEW_PAGER))
 			string_copy_rev(view->ref, text);
@@ -2592,6 +2933,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;
@@ -2601,6 +2944,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);
@@ -2608,12 +2954,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;
 }
 
@@ -2785,6 +3158,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;
 
@@ -2832,7 +3215,7 @@ tree_request(struct view *view, enum request request, struct line *line)
 static void
 tree_select(struct view *view, struct line *line)
 {
-	char *text = line->data + STRING_SIZE("100644 blob ");
+	char *text = (char *)line->data + STRING_SIZE("100644 blob ");
 
 	if (line->type == LINE_TREE_FILE) {
 		string_copy_rev(ref_blob, text);
@@ -2857,7 +3240,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 = {
@@ -2880,14 +3263,18 @@ struct status {
 	struct {
 		mode_t mode;
 		char rev[SIZEOF_REV];
+		char name[SIZEOF_STR];
 	} old;
 	struct {
 		mode_t mode;
 		char rev[SIZEOF_REV];
+		char name[SIZEOF_STR];
 	} new;
-	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
  */
@@ -2900,7 +3287,7 @@ status_get_diff(struct status *file, char *buf, size_t bufsize)
 	char *new_rev  = buf + 56;
 	char *status   = buf + 97;
 
-	if (bufsize != 99 ||
+	if (bufsize < 99 ||
 	    old_mode[-1] != ':' ||
 	    new_mode[-1] != ' ' ||
 	    old_rev[-1]  != ' ' ||
@@ -2916,7 +3303,7 @@ status_get_diff(struct status *file, char *buf, size_t bufsize)
 	file->old.mode = strtoul(old_mode, NULL, 8);
 	file->new.mode = strtoul(new_mode, NULL, 8);
 
-	file->name[0] = 0;
+	file->old.name[0] = file->new.name[0] = 0;
 
 	return TRUE;
 }
@@ -2925,6 +3312,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;
@@ -2974,12 +3362,45 @@ 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->new.name);
+
+					unmerged = NULL;
+					if (collapse) {
+						free(file);
+						view->lines--;
+						continue;
+					}
+				}
+			}
+
+			/* Grab the old name for rename/copy. */
+			if (!*file->old.name &&
+			    (file->status == 'R' || file->status == 'C')) {
+				sepsize = sep - buf + 1;
+				string_ncopy(file->old.name, buf, sepsize);
+				bufsize -= sepsize;
+				memmove(buf, sep + 1, bufsize);
+
+				sep = memchr(buf, 0, bufsize);
+				if (!sep)
+					break;
+				sepsize = sep - buf + 1;
 			}
 
 			/* git-ls-files just delivers a NUL separated
 			 * list of file names similar to the second half
 			 * of the git-diff-* output. */
-			string_ncopy(file->name, buf, sepsize);
+			string_ncopy(file->new.name, buf, sepsize);
+			if (!*file->old.name)
+				string_copy(file->old.name, file->new.name);
 			bufsize -= sepsize;
 			memmove(buf, sep + 1, bufsize);
 			file = NULL;
@@ -2999,13 +3420,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 -M 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 -C -M --cached HEAD -- %s %s 2>/dev/null"
+
+#define STATUS_DIFF_FILES_SHOW_CMD \
+	"git diff-files --root --patch-with-stat -C -M -- %s %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
@@ -3016,12 +3441,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_alloc = view->line_size = view->lineno = 0;
 	view->line = NULL;
 
 	if (!realloc_lines(view, view->line_size + 6))
@@ -3040,11 +3466,20 @@ status_open(struct view *view)
 			return FALSE;
 	}
 
+	system("git update-index -q --refresh");
+
 	if (!status_run(view, STATUS_DIFF_INDEX_CMD, TRUE, LINE_STAT_STAGED) ||
 	    !status_run(view, STATUS_DIFF_FILES_CMD, TRUE, LINE_STAT_UNSTAGED) ||
 	    !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;
 }
 
@@ -3052,12 +3487,14 @@ static bool
 status_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
 {
 	struct status *status = line->data;
+	int tilde_attr = get_line_attr(LINE_MAIN_DELIM);
 
 	wmove(view->win, lineno, 0);
 
 	if (selected) {
 		wattrset(view->win, get_line_attr(LINE_CURSOR));
 		wchgat(view->win, -1, 0, LINE_CURSOR, NULL);
+		tilde_attr = -1;
 
 	} else if (!status && line->type != LINE_STAT_NONE) {
 		wattrset(view->win, get_line_attr(LINE_STAT_SECTION));
@@ -3091,7 +3528,7 @@ status_draw(struct view *view, struct line *line, unsigned int lineno, bool sele
 			return FALSE;
 		}
 
-		waddstr(view->win, text);
+		draw_text(view, text, view->width, TRUE, tilde_attr);
 		return TRUE;
 	}
 
@@ -3099,8 +3536,10 @@ status_draw(struct view *view, struct line *line, unsigned int lineno, bool sele
 	if (!selected)
 		wattrset(view->win, A_NORMAL);
 	wmove(view->win, lineno, 4);
-	waddstr(view->win, status->name);
+	if (view->width < 5)
+		return TRUE;
 
+	draw_text(view, status->new.name, view->width - 5, TRUE, tilde_attr);
 	return TRUE;
 }
 
@@ -3108,7 +3547,8 @@ static enum request
 status_enter(struct view *view, struct line *line)
 {
 	struct status *status = line->data;
-	char path[SIZEOF_STR] = "";
+	char oldpath[SIZEOF_STR] = "";
+	char newpath[SIZEOF_STR] = "";
 	char *info;
 	size_t cmdsize = 0;
 
@@ -3118,8 +3558,15 @@ status_enter(struct view *view, struct line *line)
 		return REQ_NONE;
 	}
 
-	if (status && sq_quote(path, 0, status->name) >= sizeof(path))
-		return REQ_QUIT;
+	if (status) {
+		if (sq_quote(oldpath, 0, status->old.name) >= sizeof(oldpath))
+			return REQ_QUIT;
+		/* Diffs for unmerged entries are empty when pasing the
+		 * new path, so leave it empty. */
+		if (status->status != 'U' &&
+		    sq_quote(newpath, 0, status->new.name) >= sizeof(newpath))
+			return REQ_QUIT;
+	}
 
 	if (opt_cdup[0] &&
 	    line->type != LINE_STAT_UNTRACKED &&
@@ -3128,8 +3575,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, oldpath, newpath))
 			return REQ_QUIT;
 		if (status)
 			info = "Staged changes to %s";
@@ -3138,8 +3585,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, oldpath, newpath))
 			return REQ_QUIT;
 		if (status)
 			info = "Unstaged changes to %s";
@@ -3157,17 +3604,24 @@ status_enter(struct view *view, struct line *line)
 			return REQ_NONE;
 		}
 
-		opt_pipe = fopen(status->name, "r");
+		opt_pipe = fopen(status->new.name, "r");
 		info = "Untracked file %s";
 		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.new.name);
 	}
 
 	return REQ_NONE;
@@ -3194,7 +3648,7 @@ status_update_file(struct view *view, struct status *status, enum line_type type
 		if (!string_format_from(buf, &bufsize, "%06o %s\t%s%c",
 				        status->old.mode,
 					status->old.rev,
-					status->name, 0))
+					status->old.name, 0))
 			return FALSE;
 
 		string_add(cmd, cmdsize, "git update-index -z --index-info");
@@ -3202,14 +3656,14 @@ status_update_file(struct view *view, struct status *status, enum line_type type
 
 	case LINE_STAT_UNSTAGED:
 	case LINE_STAT_UNTRACKED:
-		if (!string_format_from(buf, &bufsize, "%s%c", status->name, 0))
+		if (!string_format_from(buf, &bufsize, "%s%c", status->new.name, 0))
 			return FALSE;
 
 		string_add(cmd, cmdsize, "git update-index -z --add --remove --stdin");
 		break;
 
 	default:
-		die("w00t");
+		die("line type %d not handled in switch", type);
 	}
 
 	pipe = popen(cmd, "w");
@@ -3249,8 +3703,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
@@ -3263,21 +3715,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->new.name);
+		break;
+
 	case REQ_EDIT:
 		if (!status)
 			return request;
 
-		open_editor(view, status->name);
+		open_editor(status->status != '?', status->new.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;
 }
 
@@ -3287,8 +3756,9 @@ 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))
+	if (status && !string_format(file, "'%s'", status->new.name))
 		return;
 
 	if (!status && line[1].type == LINE_STAT_NONE)
@@ -3312,10 +3782,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
@@ -3333,7 +3811,7 @@ status_grep(struct view *view, struct line *line)
 		char *text;
 
 		switch (state) {
-		case S_NAME:	text = status->name;	break;
+		case S_NAME:	text = status->new.name;	break;
 		case S_STATUS:
 			buf[0] = status->status;
 			text = buf;
@@ -3361,6 +3839,171 @@ static struct view_ops status_ops = {
 };
 
 
+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.new.name[0])
+			return request;
+
+		open_editor(stage_status.status != '?', stage_status.new.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
  */
@@ -3373,6 +4016,7 @@ struct commit {
 	struct ref **refs;		/* Repository references. */
 	chtype graph[SIZEOF_REVGRAPH];	/* Ancestry chain graphics. */
 	size_t graph_size;		/* The width of the graph array. */
+	bool has_parents;		/* Rewritten --parents seen. */
 };
 
 /* Size of rev graph with no  "padding" columns */
@@ -3384,6 +4028,7 @@ struct rev_graph {
 	size_t size;
 	struct commit *commit;
 	size_t pos;
+	unsigned int boundary:1;
 };
 
 /* Parents of the commit being visualized. */
@@ -3456,7 +4101,9 @@ get_rev_graph_symbol(struct rev_graph *graph)
 {
 	chtype symbol;
 
-	if (graph->parents->size == 0)
+	if (graph->boundary)
+		symbol = REVGRAPH_BOUND;
+	else if (graph->parents->size == 0)
 		symbol = REVGRAPH_INIT;
 	else if (graph_parent_is_merge(graph))
 		symbol = REVGRAPH_MERGE;
@@ -3538,7 +4185,7 @@ prepare_rev_graph(struct rev_graph *graph)
 	}
 
 	/* Interleave the new revision parent(s). */
-	for (i = 0; i < graph->parents->size; i++)
+	for (i = 0; !graph->boundary && i < graph->parents->size; i++)
 		push_rev_graph(graph->next, graph->parents->rev[i]);
 
 	/* Lastly, put any remaining revisions. */
@@ -3575,105 +4222,108 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
 	enum line_type type;
 	int col = 0;
 	size_t timelen;
-	size_t authorlen;
-	int trimmed = 1;
+	int tilde_attr;
+	int space;
 
 	if (!*commit->author)
 		return FALSE;
 
+	space = view->width;
 	wmove(view->win, lineno, col);
 
 	if (selected) {
 		type = LINE_CURSOR;
 		wattrset(view->win, get_line_attr(type));
 		wchgat(view->win, -1, 0, type, NULL);
-
+		tilde_attr = -1;
 	} else {
 		type = LINE_MAIN_COMMIT;
 		wattrset(view->win, get_line_attr(LINE_MAIN_DATE));
+		tilde_attr = get_line_attr(LINE_MAIN_DELIM);
 	}
 
-	timelen = strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time);
-	waddnstr(view->win, buf, timelen);
-	waddstr(view->win, " ");
+	if (opt_date) {
+		int n;
 
-	col += DATE_COLS;
-	wmove(view->win, lineno, col);
+		timelen = strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time);
+		n = draw_text(view, buf, view->width - col, FALSE, tilde_attr);
+		draw_text(view, " ", view->width - col - n, FALSE, tilde_attr);
+
+		col += DATE_COLS;
+		wmove(view->win, lineno, col);
+		if (col >= view->width)
+			return TRUE;
+	}
 	if (type != LINE_CURSOR)
 		wattrset(view->win, get_line_attr(LINE_MAIN_AUTHOR));
 
-	if (opt_utf8) {
-		authorlen = utf8_length(commit->author, AUTHOR_COLS - 2, &col, &trimmed);
-	} else {
-		authorlen = strlen(commit->author);
-		if (authorlen > AUTHOR_COLS - 2) {
-			authorlen = AUTHOR_COLS - 2;
-			trimmed = 1;
-		}
-	}
+	if (opt_author) {
+		int max_len;
 
-	if (trimmed) {
-		waddnstr(view->win, commit->author, authorlen);
-		if (type != LINE_CURSOR)
-			wattrset(view->win, get_line_attr(LINE_MAIN_DELIM));
-		waddch(view->win, '~');
-	} else {
-		waddstr(view->win, commit->author);
+		max_len = view->width - col;
+		if (max_len > AUTHOR_COLS - 1)
+			max_len = AUTHOR_COLS - 1;
+		draw_text(view, commit->author, max_len, TRUE, tilde_attr);
+		col += AUTHOR_COLS;
+		if (col >= view->width)
+			return TRUE;
 	}
 
-	col += AUTHOR_COLS;
-	if (type != LINE_CURSOR)
-		wattrset(view->win, A_NORMAL);
-
 	if (opt_rev_graph && commit->graph_size) {
+		size_t graph_size = view->width - col;
 		size_t i;
 
+		if (type != LINE_CURSOR)
+			wattrset(view->win, get_line_attr(LINE_MAIN_REVGRAPH));
 		wmove(view->win, lineno, col);
+		if (graph_size > commit->graph_size)
+			graph_size = commit->graph_size;
 		/* Using waddch() instead of waddnstr() ensures that
 		 * they'll be rendered correctly for the cursor line. */
-		for (i = 0; i < commit->graph_size; i++)
+		for (i = 0; i < graph_size; i++)
 			waddch(view->win, commit->graph[i]);
 
-		waddch(view->win, ' ');
 		col += commit->graph_size + 1;
+		if (col >= view->width)
+			return TRUE;
+		waddch(view->win, ' ');
 	}
+	if (type != LINE_CURSOR)
+		wattrset(view->win, A_NORMAL);
 
 	wmove(view->win, lineno, col);
 
-	if (commit->refs) {
+	if (opt_show_refs && commit->refs) {
 		size_t i = 0;
 
 		do {
 			if (type == LINE_CURSOR)
 				;
+			else if (commit->refs[i]->ltag)
+				wattrset(view->win, get_line_attr(LINE_MAIN_LOCAL_TAG));
 			else if (commit->refs[i]->tag)
 				wattrset(view->win, get_line_attr(LINE_MAIN_TAG));
 			else if (commit->refs[i]->remote)
 				wattrset(view->win, get_line_attr(LINE_MAIN_REMOTE));
 			else
 				wattrset(view->win, get_line_attr(LINE_MAIN_REF));
-			waddstr(view->win, "[");
-			waddstr(view->win, commit->refs[i]->name);
-			waddstr(view->win, "]");
+
+			col += draw_text(view, "[", view->width - col, TRUE, tilde_attr);
+			col += draw_text(view, commit->refs[i]->name, view->width - col,
+					 TRUE, tilde_attr);
+			col += draw_text(view, "]", view->width - col, TRUE, tilde_attr);
 			if (type != LINE_CURSOR)
 				wattrset(view->win, A_NORMAL);
-			waddstr(view->win, " ");
-			col += strlen(commit->refs[i]->name) + STRING_SIZE("[] ");
+			col += draw_text(view, " ", view->width - col, TRUE, tilde_attr);
+			if (col >= view->width)
+				return TRUE;
 		} while (commit->refs[i++]->next);
 	}
 
 	if (type != LINE_CURSOR)
 		wattrset(view->win, get_line_attr(type));
 
-	{
-		int titlelen = strlen(commit->title);
-
-		if (col + titlelen > view->width)
-			titlelen = view->width - col;
-
-		waddnstr(view->win, commit->title, titlelen);
-	}
-
+	draw_text(view, commit->title, view->width - col, TRUE, tilde_attr);
 	return TRUE;
 }
 
@@ -3696,10 +4346,22 @@ main_read(struct view *view, char *line)
 		if (!commit)
 			return FALSE;
 
-		string_copy_rev(commit->id, line + STRING_SIZE("commit "));
+		line += STRING_SIZE("commit ");
+		if (*line == '-') {
+			graph->boundary = 1;
+			line++;
+		}
+
+		string_copy_rev(commit->id, line);
 		commit->refs = get_refs(commit->id);
 		graph->commit = commit;
 		add_line_data(view, commit, LINE_MAIN_COMMIT);
+
+		while ((line = strchr(line, ' '))) {
+			line++;
+			push_rev_graph(graph->parents, line);
+			commit->has_parents = TRUE;
+		}
 		return TRUE;
 	}
 
@@ -3709,6 +4371,8 @@ main_read(struct view *view, char *line)
 
 	switch (type) {
 	case LINE_PARENT:
+		if (commit->has_parents)
+			break;
 		push_rev_graph(graph->parents, line + STRING_SIZE("parent "));
 		break;
 
@@ -3881,6 +4545,9 @@ unicode_width(unsigned long c)
 	    || (c >= 0x30000 && c <= 0x3fffd)))
 		return 2;
 
+	if (c == '\t')
+		return opt_tab_size;
+
 	return 1;
 }
 
@@ -3948,19 +4615,16 @@ utf8_to_unicode(const char *string, size_t length)
 
 /* Calculates how much of string can be shown within the given maximum width
  * and sets trimmed parameter to non-zero value if all of string could not be
- * shown.
- *
- * Additionally, adds to coloffset how many many columns to move to align with
- * the expected position. Takes into account how multi-byte and double-width
- * characters will effect the cursor position.
+ * shown. If the reserve flag is TRUE, it will reserve at least one
+ * trailing character, which can be useful when drawing a delimiter.
  *
  * Returns the number of bytes to output from string to satisfy max_width. */
 static size_t
-utf8_length(const char *string, size_t max_width, int *coloffset, int *trimmed)
+utf8_length(const char *string, size_t max_width, int *trimmed, bool reserve)
 {
 	const char *start = string;
 	const char *end = strchr(string, '\0');
-	size_t mbwidth = 0;
+	unsigned char last_bytes = 0;
 	size_t width = 0;
 
 	*trimmed = 0;
@@ -3986,27 +4650,16 @@ utf8_length(const char *string, size_t max_width, int *coloffset, int *trimmed)
 		width  += ucwidth;
 		if (width > max_width) {
 			*trimmed = 1;
+			if (reserve && width - ucwidth == max_width) {
+				string -= last_bytes;
+			}
 			break;
 		}
 
-		/* The column offset collects the differences between the
-		 * number of bytes encoding a character and the number of
-		 * columns will be used for rendering said character.
-		 *
-		 * So if some character A is encoded in 2 bytes, but will be
-		 * represented on the screen using only 1 byte this will and up
-		 * adding 1 to the multi-byte column offset.
-		 *
-		 * Assumes that no double-width character can be encoding in
-		 * less than two bytes. */
-		if (bytes > ucwidth)
-			mbwidth += bytes - ucwidth;
-
 		string  += bytes;
+		last_bytes = bytes;
 	}
 
-	*coloffset += mbwidth;
-
 	return string - start;
 }
 
@@ -4032,6 +4685,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;
 
@@ -4174,18 +4842,21 @@ read_prompt(const char *prompt)
  * Repository references
  */
 
-static struct ref *refs;
-static size_t refs_size;
+static struct ref *refs = NULL;
+static size_t refs_alloc = 0;
+static size_t refs_size = 0;
 
 /* Id <-> ref store */
-static struct ref ***id_refs;
-static size_t id_refs_size;
+static struct ref ***id_refs = NULL;
+static size_t id_refs_alloc = 0;
+static size_t id_refs_size = 0;
 
 static struct ref **
 get_refs(char *id)
 {
 	struct ref ***tmp_id_refs;
 	struct ref **ref_list = NULL;
+	size_t ref_list_alloc = 0;
 	size_t ref_list_size = 0;
 	size_t i;
 
@@ -4193,7 +4864,8 @@ get_refs(char *id)
 		if (!strcmp(id, id_refs[i][0]->id))
 			return id_refs[i];
 
-	tmp_id_refs = realloc(id_refs, (id_refs_size + 1) * sizeof(*id_refs));
+	tmp_id_refs = realloc_items(id_refs, &id_refs_alloc, id_refs_size + 1,
+				    sizeof(*id_refs));
 	if (!tmp_id_refs)
 		return NULL;
 
@@ -4205,7 +4877,8 @@ get_refs(char *id)
 		if (strcmp(id, refs[i].id))
 			continue;
 
-		tmp = realloc(ref_list, (ref_list_size + 1) * sizeof(*ref_list));
+		tmp = realloc_items(ref_list, &ref_list_alloc,
+				    ref_list_size + 1, sizeof(*ref_list));
 		if (!tmp) {
 			if (ref_list)
 				free(ref_list);
@@ -4235,15 +4908,19 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen)
 {
 	struct ref *ref;
 	bool tag = FALSE;
+	bool ltag = FALSE;
 	bool remote = FALSE;
+	bool check_replace = FALSE;
 
 	if (!strncmp(name, "refs/tags/", STRING_SIZE("refs/tags/"))) {
-		/* Commits referenced by tags has "^{}" appended. */
-		if (name[namelen - 1] != '}')
-			return OK;
-
-		while (namelen > 0 && name[namelen] != '^')
-			namelen--;
+		if (!strcmp(name + namelen - 3, "^{}")) {
+			namelen -= 3;
+			name[namelen] = 0;
+			if (refs_size > 0 && refs[refs_size - 1].ltag == TRUE)
+				check_replace = TRUE;
+		} else {
+			ltag = TRUE;
+		}
 
 		tag = TRUE;
 		namelen -= STRING_SIZE("refs/tags/");
@@ -4262,7 +4939,17 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen)
 		return OK;
 	}
 
-	refs = realloc(refs, sizeof(*refs) * (refs_size + 1));
+	if (check_replace && !strcmp(name, refs[refs_size - 1].name)) {
+		/* it's an annotated tag, replace the previous sha1 with the
+		 * resolved commit id; relies on the fact git-ls-remote lists
+		 * the commit id of an annotated tag right beofre the commit id
+		 * it points to. */
+		refs[refs_size - 1].ltag = ltag;
+		string_copy_rev(refs[refs_size - 1].id, id);
+
+		return OK;
+	}
+	refs = realloc_items(refs, &refs_alloc, refs_size + 1, sizeof(*refs));
 	if (!refs)
 		return ERR;
 
@@ -4274,6 +4961,7 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen)
 	strncpy(ref->name, name, namelen);
 	ref->name[namelen] = 0;
 	ref->tag = tag;
+	ref->ltag = ltag;
 	ref->remote = remote;
 	string_copy_rev(ref->id, id);
 
@@ -4304,17 +4992,28 @@ read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen
 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;
 }
 
@@ -4323,7 +5022,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);
 }
 
@@ -4397,6 +5096,18 @@ die(const char *err, ...)
 	exit(1);
 }
 
+static void
+warn(const char *msg, ...)
+{
+	va_list args;
+
+	va_start(args, msg);
+	fputs("tig warning: ", stderr);
+	vfprintf(stderr, msg, args);
+	fputs("\n", stderr);
+	va_end(args);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -4415,10 +5126,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.");
 
@@ -4430,6 +5137,13 @@ 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_encoding && strcasecmp(opt_encoding, "UTF-8"))
+		opt_utf8 = FALSE;
+
 	if (*opt_codeset && strcmp(opt_codeset, opt_encoding)) {
 		opt_iconv = iconv_open(opt_codeset, opt_encoding);
 		if (opt_iconv == ICONV_NONE)