X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/504fbeeb9b6e7db4c9dfac9c54489b19a33a9c67..7672417830e55a1544b7e9d0d1afd11f0f98dbf6:/tig.c

diff --git a/tig.c b/tig.c
index 36f03c2..dc48eed 100644
--- a/tig.c
+++ b/tig.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2007 Jonas Fonseca <fonseca@diku.dk>
+/* Copyright (c) 2006-2008 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
@@ -94,14 +94,17 @@ static size_t utf8_length(const char *string, size_t max_width, int *trimmed, bo
 #define DATE_COLS	STRING_SIZE("2006-04-29 14:21 ")
 
 #define AUTHOR_COLS	20
+#define ID_COLS		8
 
 /* The default interval between line numbers. */
-#define NUMBER_INTERVAL	1
+#define NUMBER_INTERVAL	5
 
 #define TABSIZE		8
 
 #define	SCALE_SPLIT_VIEW(height)	((height) * 2 / 3)
 
+#define NULL_ID		"0000000000000000000000000000000000000000"
+
 #ifndef GIT_CONFIG
 #define GIT_CONFIG "git config"
 #endif
@@ -116,7 +119,7 @@ static size_t utf8_length(const char *string, size_t max_width, int *trimmed, bo
 	"git log --no-color --cc --stat -n100 %s 2>/dev/null"
 
 #define TIG_MAIN_CMD \
-	"git log --no-color --topo-order --boundary --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"
@@ -129,6 +132,7 @@ static size_t utf8_length(const char *string, size_t max_width, int *trimmed, bo
 #define TIG_PAGER_CMD	""
 #define TIG_STATUS_CMD	""
 #define TIG_STAGE_CMD	""
+#define TIG_BLAME_CMD	""
 
 /* Some ascii-shorthands fitted into the ncurses namespace. */
 #define KEY_TAB		'\t'
@@ -143,6 +147,7 @@ struct ref {
 	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? */
+	unsigned int head:1;	/* Is it the current HEAD? */
 };
 
 static struct ref **get_refs(char *id);
@@ -314,6 +319,7 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
 	REQ_(VIEW_LOG,		"Show log view"), \
 	REQ_(VIEW_TREE,		"Show tree view"), \
 	REQ_(VIEW_BLOB,		"Show blob view"), \
+	REQ_(VIEW_BLAME,	"Show blame view"), \
 	REQ_(VIEW_HELP,		"Show help page"), \
 	REQ_(VIEW_PAGER,	"Show pager view"), \
 	REQ_(VIEW_STATUS,	"Show status view"), \
@@ -418,12 +424,13 @@ static const char usage[] =
 "\n"
 "Usage: tig        [options] [revs] [--] [paths]\n"
 "   or: tig show   [options] [revs] [--] [paths]\n"
+"   or: tig blame  [rev] path\n"
 "   or: tig status\n"
 "   or: tig <      [git command output]\n"
 "\n"
 "Options:\n"
 "  -v, --version   Show version and exit\n"
-"  -h, --help      Show help message and exit\n";
+"  -h, --help      Show help message and exit";
 
 /* Option and state variables. */
 static bool opt_date			= TRUE;
@@ -436,6 +443,10 @@ static int opt_tab_size			= TABSIZE;
 static enum request opt_request		= REQ_VIEW_MAIN;
 static char opt_cmd[SIZEOF_STR]		= "";
 static char opt_path[SIZEOF_STR]	= "";
+static char opt_file[SIZEOF_STR]	= "";
+static char opt_ref[SIZEOF_REF]		= "";
+static char opt_head[SIZEOF_REF]	= "";
+static bool opt_no_head			= TRUE;
 static FILE *opt_pipe			= NULL;
 static char opt_encoding[20]		= "UTF-8";
 static bool opt_utf8			= TRUE;
@@ -447,164 +458,90 @@ 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 {
-	OPT_NONE,
-	OPT_INT,
-};
-
 static bool
-check_option(char *opt, char short_name, char *name, enum option_type type, ...)
+parse_options(int argc, char *argv[])
 {
-	va_list args;
-	char *value = "";
-	int *number;
+	size_t buf_size;
+	char *subcommand;
+	bool seen_dashdash = FALSE;
+	int i;
 
-	if (opt[0] != '-')
-		return FALSE;
+	if (argc <= 1)
+		return TRUE;
 
-	if (opt[1] == '-') {
-		int namelen = strlen(name);
+	subcommand = argv[1];
+	if (!strcmp(subcommand, "status") || !strcmp(subcommand, "-S")) {
+		opt_request = REQ_VIEW_STATUS;
+		if (!strcmp(subcommand, "-S"))
+			warn("`-S' has been deprecated; use `tig status' instead");
+		if (argc > 2)
+			warn("ignoring arguments after `%s'", subcommand);
+		return TRUE;
 
-		opt += 2;
+	} else if (!strcmp(subcommand, "blame")) {
+		opt_request = REQ_VIEW_BLAME;
+		if (argc <= 2 || argc > 4)
+			die("invalid number of options to blame\n\n%s", usage);
 
-		if (strncmp(opt, name, namelen))
-			return FALSE;
+		i = 2;
+		if (argc == 4) {
+			string_ncopy(opt_ref, argv[i], strlen(argv[i]));
+			i++;
+		}
 
-		if (opt[namelen] == '=')
-			value = opt + namelen + 1;
+		string_ncopy(opt_file, argv[i], strlen(argv[i]));
+		return TRUE;
 
-	} else {
-		if (!short_name || opt[1] != short_name)
-			return FALSE;
-		value = opt + 2;
-	}
+	} else if (!strcmp(subcommand, "show")) {
+		opt_request = REQ_VIEW_DIFF;
 
-	va_start(args, type);
-	if (type == OPT_INT) {
-		number = va_arg(args, int *);
-		if (isdigit(*value))
-			*number = atoi(value);
+	} else if (!strcmp(subcommand, "log") || !strcmp(subcommand, "diff")) {
+		opt_request = subcommand[0] == 'l'
+			    ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
+		warn("`tig %s' has been deprecated", subcommand);
+
+	} else {
+		subcommand = NULL;
 	}
-	va_end(args);
 
-	return TRUE;
-}
+	if (!subcommand)
+		/* XXX: This is vulnerable to the user overriding
+		 * options required for the main view parser. */
+		string_copy(opt_cmd, "git log --no-color --pretty=raw --boundary --parents");
+	else
+		string_format(opt_cmd, "git %s", subcommand);
 
-/* Returns the index of log or diff command or -1 to exit. */
-static bool
-parse_options(int argc, char *argv[])
-{
-	char *altargv[1024];
-	int altargc = 0;
-	char *subcommand = NULL;
-	int i;
+	buf_size = strlen(opt_cmd);
 
-	for (i = 1; i < argc; i++) {
+	for (i = 1 + !!subcommand; i < argc; i++) {
 		char *opt = argv[i];
 
-		if (!strcmp(opt, "log") ||
-		    !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 (seen_dashdash || !strcmp(opt, "--")) {
+			seen_dashdash = TRUE;
 
-		if (!strcmp(opt, "show")) {
-			subcommand = opt;
-			opt_request = REQ_VIEW_DIFF;
-			break;
-		}
-
-		if (!strcmp(opt, "status")) {
-			subcommand = opt;
-			opt_request = REQ_VIEW_STATUS;
-			break;
-		}
-
-		if (opt[0] && opt[0] != '-')
-			break;
-
-		if (!strcmp(opt, "--")) {
-			i++;
-			break;
-		}
-
-		if (check_option(opt, 'v', "version", OPT_NONE)) {
+		} else if (!strcmp(opt, "-v") || !strcmp(opt, "--version")) {
 			printf("tig version %s\n", TIG_VERSION);
 			return FALSE;
-		}
 
-		if (check_option(opt, 'h', "help", OPT_NONE)) {
-			printf(usage);
+		} else if (!strcmp(opt, "-h") || !strcmp(opt, "--help")) {
+			printf("%s\n", usage);
 			return FALSE;
 		}
 
-		if (!strcmp(opt, "-S")) {
-			warn("`%s' has been deprecated; use `tig status' instead", opt);
-			opt_request = REQ_VIEW_STATUS;
-			continue;
-		}
-
-		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);
+		opt_cmd[buf_size++] = ' ';
+		buf_size = sq_quote(opt_cmd, buf_size, opt);
+		if (buf_size >= sizeof(opt_cmd))
+			die("command too long");
 	}
 
-	/* 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 (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 --no-color --pretty=raw --boundary");
-		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++]);
-		}
-
-		if (buf_size >= sizeof(opt_cmd))
-			die("command too long");
-
-		opt_cmd[buf_size] = 0;
+		buf_size = 0;
 	}
 
+	opt_cmd[buf_size] = 0;
+
 	return TRUE;
 }
 
@@ -645,24 +582,31 @@ LINE(ACKED,	   "    Acked-by",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
 LINE(DEFAULT,	   "",			COLOR_DEFAULT,	COLOR_DEFAULT,	A_NORMAL), \
 LINE(CURSOR,	   "",			COLOR_WHITE,	COLOR_GREEN,	A_BOLD), \
 LINE(STATUS,	   "",			COLOR_GREEN,	COLOR_DEFAULT,	0), \
+LINE(DELIMITER,	   "",			COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
 LINE(TITLE_BLUR,   "",			COLOR_WHITE,	COLOR_BLUE,	0), \
 LINE(TITLE_FOCUS,  "",			COLOR_WHITE,	COLOR_BLUE,	A_BOLD), \
 LINE(MAIN_DATE,    "",			COLOR_BLUE,	COLOR_DEFAULT,	0), \
 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_HEAD,    "",			COLOR_RED,	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_HEAD,    "",			COLOR_YELLOW,	COLOR_DEFAULT,	0), \
 LINE(STAT_SECTION, "",			COLOR_CYAN,	COLOR_DEFAULT,	0), \
 LINE(STAT_NONE,    "",			COLOR_DEFAULT,	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)
+LINE(STAT_UNTRACKED,"",			COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
+LINE(BLAME_DATE,    "",			COLOR_BLUE,	COLOR_DEFAULT,	0), \
+LINE(BLAME_AUTHOR,  "",			COLOR_GREEN,	COLOR_DEFAULT,	0), \
+LINE(BLAME_COMMIT, "",			COLOR_DEFAULT,	COLOR_DEFAULT,	0), \
+LINE(BLAME_ID,     "",			COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
+LINE(BLAME_LINENO, "",			COLOR_CYAN,	COLOR_DEFAULT,	0)
 
 enum line_type {
 #define LINE(type, line, fg, bg, attr) \
@@ -709,8 +653,9 @@ get_line_attr(enum line_type type)
 }
 
 static struct line_info *
-get_line_info(char *name, int namelen)
+get_line_info(char *name)
 {
+	size_t namelen = strlen(name);
 	enum line_type type;
 
 	for (type = 0; type < ARRAY_SIZE(line_info); type++)
@@ -749,6 +694,7 @@ struct line {
 
 	/* State flags */
 	unsigned int selected:1;
+	unsigned int dirty:1;
 
 	void *data;		/* User data */
 };
@@ -771,6 +717,7 @@ static struct keybinding default_keybindings[] = {
 	{ 'l',		REQ_VIEW_LOG },
 	{ 't',		REQ_VIEW_TREE },
 	{ 'f',		REQ_VIEW_BLOB },
+	{ 'B',		REQ_VIEW_BLAME },
 	{ 'p',		REQ_VIEW_PAGER },
 	{ 'h',		REQ_VIEW_HELP },
 	{ 'S',		REQ_VIEW_STATUS },
@@ -834,6 +781,7 @@ static struct keybinding default_keybindings[] = {
 	KEYMAP_(LOG), \
 	KEYMAP_(TREE), \
 	KEYMAP_(BLOB), \
+	KEYMAP_(BLAME), \
 	KEYMAP_(PAGER), \
 	KEYMAP_(HELP), \
 	KEYMAP_(STATUS), \
@@ -1103,10 +1051,15 @@ option_color_command(int argc, char *argv[])
 		return ERR;
 	}
 
-	info = get_line_info(argv[0], strlen(argv[0]));
+	info = get_line_info(argv[0]);
 	if (!info) {
-		config_msg = "Unknown color name";
-		return ERR;
+		if (!string_enum_compare(argv[0], "main-delim", strlen("main-delim"))) {
+			info = get_line_info("delimiter");
+
+		} else {
+			config_msg = "Unknown color name";
+			return ERR;
+		}
 	}
 
 	if (set_color(&info->fg, argv[1]) == ERR ||
@@ -1458,6 +1411,7 @@ static struct view_ops pager_ops;
 static struct view_ops main_ops;
 static struct view_ops tree_ops;
 static struct view_ops blob_ops;
+static struct view_ops blame_ops;
 static struct view_ops help_ops;
 static struct view_ops status_ops;
 static struct view_ops stage_ops;
@@ -1475,6 +1429,7 @@ static struct view views[] = {
 	VIEW_(LOG,    "log",    &pager_ops,  ref_head),
 	VIEW_(TREE,   "tree",   &tree_ops,   ref_commit),
 	VIEW_(BLOB,   "blob",   &blob_ops,   ref_blob),
+	VIEW_(BLAME,  "blame",  &blame_ops,  ref_commit),
 	VIEW_(HELP,   "help",   &help_ops,   ""),
 	VIEW_(PAGER,  "pager",  &pager_ops,  "stdin"),
 	VIEW_(STATUS, "status", &status_ops, ""),
@@ -1490,8 +1445,8 @@ static struct view views[] = {
 	(view == display[0] || view == display[1])
 
 static int
-draw_text(struct view *view, const char *string, int max_len, int col,
-	  bool use_tilde, int tilde_attr)
+draw_text(struct view *view, const char *string, int max_len,
+	  bool use_tilde, bool selected)
 {
 	int len = 0;
 	int trimmed = FALSE;
@@ -1514,8 +1469,8 @@ draw_text(struct view *view, const char *string, int max_len, int col,
 
 	waddnstr(view->win, string, len);
 	if (trimmed && use_tilde) {
-		if (tilde_attr != -1)
-			wattrset(view->win, tilde_attr);
+		if (!selected)
+			wattrset(view->win, get_line_attr(LINE_DELIMITER));
 		waddch(view->win, '~');
 		len++;
 	}
@@ -1554,6 +1509,32 @@ draw_view_line(struct view *view, unsigned int lineno)
 }
 
 static void
+redraw_view_dirty(struct view *view)
+{
+	bool dirty = FALSE;
+	int lineno;
+
+	for (lineno = 0; lineno < view->height; lineno++) {
+		struct line *line = &view->line[view->offset + lineno];
+
+		if (!line->dirty)
+			continue;
+		line->dirty = 0;
+		dirty = TRUE;
+		if (!draw_view_line(view, lineno))
+			break;
+	}
+
+	if (!dirty)
+		return;
+	redrawwin(view->win);
+	if (input_mode)
+		wnoutrefresh(view->win);
+	else
+		wrefresh(view->win);
+}
+
+static void
 redraw_view_from(struct view *view, int lineno)
 {
 	assert(0 <= lineno && lineno < view->height);
@@ -2221,6 +2202,9 @@ update_view(struct view *view)
 		redraw_view_from(view, redraw_from);
 	}
 
+	if (view == VIEW(REQ_VIEW_BLAME))
+		redraw_view_dirty(view);
+
 	/* Update the title _after_ the redraw so that if the redraw picks up a
 	 * commit reference in view->ref it'll be available here. */
 	update_view_title(view);
@@ -2241,8 +2225,8 @@ alloc_error:
 	report("Allocation failure");
 
 end:
-	view->ops->read(view, NULL);
-	end_update(view);
+	if (view->ops->read(view, NULL))
+		end_update(view);
 	return FALSE;
 }
 
@@ -2497,6 +2481,15 @@ view_driver(struct view *view, enum request request)
 		scroll_view(view, request);
 		break;
 
+	case REQ_VIEW_BLAME:
+		if (!opt_file[0]) {
+			report("No file chosen, press %s to open tree view",
+			       get_key(REQ_VIEW_TREE));
+			break;
+		}
+		open_view(view, request, OPEN_DEFAULT);
+		break;
+
 	case REQ_VIEW_BLOB:
 		if (!ref_blob[0]) {
 			report("No file chosen, press %s to open tree view",
@@ -2546,6 +2539,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_DIFF) &&
+		     view->parent == VIEW(REQ_VIEW_BLAME)) ||
 		   (view == VIEW(REQ_VIEW_STAGE) &&
 		     view->parent == VIEW(REQ_VIEW_STATUS)) ||
 		   (view == VIEW(REQ_VIEW_BLOB) &&
@@ -2745,9 +2740,7 @@ pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selec
 		}
 
 	} else {
-		int tilde_attr = get_line_attr(LINE_MAIN_DELIM);
-
-		draw_text(view, text, view->width, 0, TRUE, tilde_attr);
+		draw_text(view, text, view->width, TRUE, selected);
 	}
 
 	return TRUE;
@@ -3075,6 +3068,14 @@ tree_compare_entry(enum line_type type1, char *name1,
 	return strcmp(name1, name2);
 }
 
+static char *
+tree_path(struct line *line)
+{
+	char *path = line->data;
+
+	return path + SIZEOF_TREE_ATTR;
+}
+
 static bool
 tree_read(struct view *view, char *text)
 {
@@ -3084,6 +3085,8 @@ tree_read(struct view *view, char *text)
 	enum line_type type;
 	bool first_read = view->lines == 0;
 
+	if (!text)
+		return TRUE;
 	if (textlen <= SIZEOF_TREE_ATTR)
 		return FALSE;
 
@@ -3120,7 +3123,7 @@ tree_read(struct view *view, char *text)
 	/* Skip "Directory ..." and ".." line. */
 	for (pos = 1 + !!*opt_path; pos < view->lines; pos++) {
 		struct line *line = &view->line[pos];
-		char *path1 = ((char *) line->data) + SIZEOF_TREE_ATTR;
+		char *path1 = tree_path(line);
 		char *path2 = text + SIZEOF_TREE_ATTR;
 		int cmp = tree_compare_entry(line->type, path1, type, path2);
 
@@ -3158,6 +3161,18 @@ tree_request(struct view *view, enum request request, struct line *line)
 {
 	enum open_flags flags;
 
+	if (request == REQ_VIEW_BLAME) {
+		char *filename = tree_path(line);
+
+		if (line->type == LINE_TREE_DIR) {
+			report("Cannot show blame for directory %s", opt_path);
+			return REQ_NONE;
+		}
+
+		string_copy(opt_ref, view->vid);
+		string_format(opt_file, "%s%s", opt_path, filename);
+		return request;
+	}
 	if (request == REQ_TREE_PARENT) {
 		if (*opt_path) {
 			/* fake 'cd  ..' */
@@ -3183,8 +3198,7 @@ tree_request(struct view *view, enum request request, struct line *line)
 			pop_tree_stack_entry();
 
 		} else {
-			char *data = line->data;
-			char *basename = data + SIZEOF_TREE_ATTR;
+			char *basename = tree_path(line);
 
 			push_tree_stack_entry(basename, view->lineno);
 		}
@@ -3240,6 +3254,8 @@ static struct view_ops tree_ops = {
 static bool
 blob_read(struct view *view, char *line)
 {
+	if (!line)
+		return TRUE;
 	return add_line_text(view, line, LINE_DEFAULT) != NULL;
 }
 
@@ -3253,6 +3269,447 @@ static struct view_ops blob_ops = {
 	pager_select,
 };
 
+/*
+ * Blame backend
+ *
+ * Loading the blame view is a two phase job:
+ *
+ *  1. File content is read either using opt_file from the
+ *     filesystem or using git-cat-file.
+ *  2. Then blame information is incrementally added by
+ *     reading output from git-blame.
+ */
+
+struct blame_commit {
+	char id[SIZEOF_REV];		/* SHA1 ID. */
+	char title[128];		/* First line of the commit message. */
+	char author[75];		/* Author of the commit. */
+	struct tm time;			/* Date from the author ident. */
+	char filename[128];		/* Name of file. */
+};
+
+struct blame {
+	struct blame_commit *commit;
+	unsigned int header:1;
+	char text[1];
+};
+
+#define BLAME_CAT_FILE_CMD "git cat-file blob %s:%s"
+#define BLAME_INCREMENTAL_CMD "git blame --incremental %s %s"
+
+static bool
+blame_open(struct view *view)
+{
+	char path[SIZEOF_STR];
+	char ref[SIZEOF_STR] = "";
+
+	if (sq_quote(path, 0, opt_file) >= sizeof(path))
+		return FALSE;
+
+	if (*opt_ref && sq_quote(ref, 0, opt_ref) >= sizeof(ref))
+		return FALSE;
+
+	if (*opt_ref) {
+		if (!string_format(view->cmd, BLAME_CAT_FILE_CMD, ref, path))
+			return FALSE;
+	} else {
+		view->pipe = fopen(opt_file, "r");
+		if (!view->pipe &&
+		    !string_format(view->cmd, BLAME_CAT_FILE_CMD, "HEAD", path))
+			return FALSE;
+	}
+
+	if (!view->pipe)
+		view->pipe = popen(view->cmd, "r");
+	if (!view->pipe)
+		return FALSE;
+
+	if (!string_format(view->cmd, BLAME_INCREMENTAL_CMD, ref, path))
+		return FALSE;
+
+	string_format(view->ref, "%s ...", opt_file);
+	string_copy_rev(view->vid, opt_file);
+	set_nonblocking_input(TRUE);
+
+	if (view->line) {
+		int i;
+
+		for (i = 0; i < view->lines; i++)
+			free(view->line[i].data);
+		free(view->line);
+	}
+
+	view->lines = view->line_alloc = view->line_size = view->lineno = 0;
+	view->offset = view->lines  = view->lineno = 0;
+	view->line = NULL;
+	view->start_time = time(NULL);
+
+	return TRUE;
+}
+
+static struct blame_commit *
+get_blame_commit(struct view *view, const char *id)
+{
+	size_t i;
+
+	for (i = 0; i < view->lines; i++) {
+		struct blame *blame = view->line[i].data;
+
+		if (!blame->commit)
+			continue;
+
+		if (!strncmp(blame->commit->id, id, SIZEOF_REV - 1))
+			return blame->commit;
+	}
+
+	{
+		struct blame_commit *commit = calloc(1, sizeof(*commit));
+
+		if (commit)
+			string_ncopy(commit->id, id, SIZEOF_REV);
+		return commit;
+	}
+}
+
+static bool
+parse_number(char **posref, size_t *number, size_t min, size_t max)
+{
+	char *pos = *posref;
+
+	*posref = NULL;
+	pos = strchr(pos + 1, ' ');
+	if (!pos || !isdigit(pos[1]))
+		return FALSE;
+	*number = atoi(pos + 1);
+	if (*number < min || *number > max)
+		return FALSE;
+
+	*posref = pos;
+	return TRUE;
+}
+
+static struct blame_commit *
+parse_blame_commit(struct view *view, char *text, int *blamed)
+{
+	struct blame_commit *commit;
+	struct blame *blame;
+	char *pos = text + SIZEOF_REV - 1;
+	size_t lineno;
+	size_t group;
+
+	if (strlen(text) <= SIZEOF_REV || *pos != ' ')
+		return NULL;
+
+	if (!parse_number(&pos, &lineno, 1, view->lines) ||
+	    !parse_number(&pos, &group, 1, view->lines - lineno + 1))
+		return NULL;
+
+	commit = get_blame_commit(view, text);
+	if (!commit)
+		return NULL;
+
+	*blamed += group;
+	while (group--) {
+		struct line *line = &view->line[lineno + group - 1];
+
+		blame = line->data;
+		blame->commit = commit;
+		blame->header = !group;
+		line->dirty = 1;
+	}
+
+	return commit;
+}
+
+static bool
+blame_read_file(struct view *view, char *line)
+{
+	if (!line) {
+		FILE *pipe = NULL;
+
+		if (view->lines > 0)
+			pipe = popen(view->cmd, "r");
+		view->cmd[0] = 0;
+		if (!pipe) {
+			report("Failed to load blame data");
+			return TRUE;
+		}
+
+		fclose(view->pipe);
+		view->pipe = pipe;
+		return FALSE;
+
+	} else {
+		size_t linelen = strlen(line);
+		struct blame *blame = malloc(sizeof(*blame) + linelen);
+
+		if (!line)
+			return FALSE;
+
+		blame->commit = NULL;
+		strncpy(blame->text, line, linelen);
+		blame->text[linelen] = 0;
+		return add_line_data(view, blame, LINE_BLAME_COMMIT) != NULL;
+	}
+}
+
+static bool
+match_blame_header(const char *name, char **line)
+{
+	size_t namelen = strlen(name);
+	bool matched = !strncmp(name, *line, namelen);
+
+	if (matched)
+		*line += namelen;
+
+	return matched;
+}
+
+static bool
+blame_read(struct view *view, char *line)
+{
+	static struct blame_commit *commit = NULL;
+	static int blamed = 0;
+	static time_t author_time;
+
+	if (*view->cmd)
+		return blame_read_file(view, line);
+
+	if (!line) {
+		/* Reset all! */
+		commit = NULL;
+		blamed = 0;
+		string_format(view->ref, "%s", view->vid);
+		if (view_is_displayed(view)) {
+			update_view_title(view);
+			redraw_view_from(view, 0);
+		}
+		return TRUE;
+	}
+
+	if (!commit) {
+		commit = parse_blame_commit(view, line, &blamed);
+		string_format(view->ref, "%s %2d%%", view->vid,
+			      blamed * 100 / view->lines);
+
+	} else if (match_blame_header("author ", &line)) {
+		string_ncopy(commit->author, line, strlen(line));
+
+	} else if (match_blame_header("author-time ", &line)) {
+		author_time = (time_t) atol(line);
+
+	} else if (match_blame_header("author-tz ", &line)) {
+		long tz;
+
+		tz  = ('0' - line[1]) * 60 * 60 * 10;
+		tz += ('0' - line[2]) * 60 * 60;
+		tz += ('0' - line[3]) * 60;
+		tz += ('0' - line[4]) * 60;
+
+		if (line[0] == '-')
+			tz = -tz;
+
+		author_time -= tz;
+		gmtime_r(&author_time, &commit->time);
+
+	} else if (match_blame_header("summary ", &line)) {
+		string_ncopy(commit->title, line, strlen(line));
+
+	} else if (match_blame_header("filename ", &line)) {
+		string_ncopy(commit->filename, line, strlen(line));
+		commit = NULL;
+	}
+
+	return TRUE;
+}
+
+static bool
+blame_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
+{
+	struct blame *blame = line->data;
+	int col = 0;
+
+	wmove(view->win, lineno, 0);
+
+	if (selected) {
+		wattrset(view->win, get_line_attr(LINE_CURSOR));
+		wchgat(view->win, -1, 0, LINE_CURSOR, NULL);
+	} else {
+		wattrset(view->win, A_NORMAL);
+	}
+
+	if (opt_date) {
+		int n;
+
+		if (!selected)
+			wattrset(view->win, get_line_attr(LINE_MAIN_DATE));
+		if (blame->commit) {
+			char buf[DATE_COLS + 1];
+			int timelen;
+
+			timelen = strftime(buf, sizeof(buf), DATE_FORMAT, &blame->commit->time);
+			n = draw_text(view, buf, view->width - col, FALSE, selected);
+			draw_text(view, " ", view->width - col - n, FALSE, selected);
+		}
+
+		col += DATE_COLS;
+		wmove(view->win, lineno, col);
+		if (col >= view->width)
+			return TRUE;
+	}
+
+	if (opt_author) {
+		int max = MIN(AUTHOR_COLS - 1, view->width - col);
+
+		if (!selected)
+			wattrset(view->win, get_line_attr(LINE_MAIN_AUTHOR));
+		if (blame->commit)
+			draw_text(view, blame->commit->author, max, TRUE, selected);
+		col += AUTHOR_COLS;
+		if (col >= view->width)
+			return TRUE;
+		wmove(view->win, lineno, col);
+	}
+
+	{
+		int max = MIN(ID_COLS - 1, view->width - col);
+
+		if (!selected)
+			wattrset(view->win, get_line_attr(LINE_BLAME_ID));
+		if (blame->commit)
+			draw_text(view, blame->commit->id, max, FALSE, -1);
+		col += ID_COLS;
+		if (col >= view->width)
+			return TRUE;
+		wmove(view->win, lineno, col);
+	}
+
+	{
+		unsigned long real_lineno = view->offset + lineno + 1;
+		char number[10] = "          ";
+		int max = MIN(view->digits, STRING_SIZE(number));
+		bool showtrimmed = FALSE;
+
+		if (real_lineno == 1 ||
+		    (real_lineno % opt_num_interval) == 0) {
+			char fmt[] = "%1ld";
+
+			if (view->digits <= 9)
+				fmt[1] = '0' + view->digits;
+
+			if (!string_format(number, fmt, real_lineno))
+				number[0] = 0;
+			showtrimmed = TRUE;
+		}
+
+		if (max > view->width - col)
+			max = view->width - col;
+		if (!selected)
+			wattrset(view->win, get_line_attr(LINE_BLAME_LINENO));
+		col += draw_text(view, number, max, showtrimmed, selected);
+		if (col >= view->width)
+			return TRUE;
+	}
+
+	if (!selected)
+		wattrset(view->win, A_NORMAL);
+
+	if (col >= view->width)
+		return TRUE;
+	waddch(view->win, ACS_VLINE);
+	col++;
+	if (col >= view->width)
+		return TRUE;
+	waddch(view->win, ' ');
+	col++;
+	col += draw_text(view, blame->text, view->width - col, TRUE, selected);
+
+	return TRUE;
+}
+
+static enum request
+blame_request(struct view *view, enum request request, struct line *line)
+{
+	enum open_flags flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
+	struct blame *blame = line->data;
+
+	switch (request) {
+	case REQ_ENTER:
+		if (!blame->commit) {
+			report("No commit loaded yet");
+			break;
+		}
+
+		if (!strcmp(blame->commit->id, NULL_ID)) {
+			char path[SIZEOF_STR];
+
+			if (sq_quote(path, 0, view->vid) >= sizeof(path))
+				break;
+			string_format(opt_cmd, "git diff-index --root --patch-with-stat -C -M --cached HEAD -- %s 2>/dev/null", path);
+		}
+
+		open_view(view, REQ_VIEW_DIFF, flags);
+		break;
+
+	default:
+		return request;
+	}
+
+	return REQ_NONE;
+}
+
+static bool
+blame_grep(struct view *view, struct line *line)
+{
+	struct blame *blame = line->data;
+	struct blame_commit *commit = blame->commit;
+	regmatch_t pmatch;
+
+#define MATCH(text) \
+	(*text && regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH)
+
+	if (commit) {
+		char buf[DATE_COLS + 1];
+
+		if (MATCH(commit->title) ||
+		    MATCH(commit->author) ||
+		    MATCH(commit->id))
+			return TRUE;
+
+		if (strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time) &&
+		    MATCH(buf))
+			return TRUE;
+	}
+
+	return MATCH(blame->text);
+
+#undef MATCH
+}
+
+static void
+blame_select(struct view *view, struct line *line)
+{
+	struct blame *blame = line->data;
+	struct blame_commit *commit = blame->commit;
+
+	if (!commit)
+		return;
+
+	if (!strcmp(commit->id, NULL_ID))
+		string_ncopy(ref_commit, "HEAD", 4);
+	else
+		string_copy_rev(ref_commit, commit->id);
+}
+
+static struct view_ops blame_ops = {
+	"line",
+	blame_open,
+	blame_read,
+	blame_draw,
+	blame_request,
+	blame_grep,
+	blame_select,
+};
 
 /*
  * Status backend
@@ -3272,6 +3729,7 @@ struct status {
 	} new;
 };
 
+static char status_onbranch[SIZEOF_STR];
 static struct status stage_status;
 static enum line_type stage_line_type;
 
@@ -3309,7 +3767,7 @@ status_get_diff(struct status *file, char *buf, size_t bufsize)
 }
 
 static bool
-status_run(struct view *view, const char cmd[], bool diff, enum line_type type)
+status_run(struct view *view, const char cmd[], char status, enum line_type type)
 {
 	struct status *file = NULL;
 	struct status *unmerged = NULL;
@@ -3348,8 +3806,10 @@ status_run(struct view *view, const char cmd[], bool diff, enum line_type type)
 			}
 
 			/* Parse diff info part. */
-			if (!diff) {
-				file->status = '?';
+			if (status) {
+				file->status = status;
+				if (status == 'A')
+					string_copy(file->old.rev, NULL_ID);
 
 			} else if (!file->status) {
 				if (!status_get_diff(file, buf, sepsize))
@@ -3425,6 +3885,8 @@ error_out:
 #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_LIST_NO_HEAD_CMD \
+	"git ls-files -z --cached --exclude-per-directory=.gitignore"
 
 #define STATUS_DIFF_INDEX_SHOW_CMD \
 	"git diff-index --root --patch-with-stat -C -M --cached HEAD -- %s %s 2>/dev/null"
@@ -3432,6 +3894,9 @@ error_out:
 #define STATUS_DIFF_FILES_SHOW_CMD \
 	"git diff-files --root --patch-with-stat -C -M -- %s %s 2>/dev/null"
 
+#define STATUS_DIFF_NO_HEAD_SHOW_CMD \
+	"git diff --no-color --patch-with-stat /dev/null %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
  * git-ls-files(1). */
@@ -3440,8 +3905,10 @@ status_open(struct view *view)
 {
 	struct stat statbuf;
 	char exclude[SIZEOF_STR];
-	char cmd[SIZEOF_STR];
+	char indexcmd[SIZEOF_STR] = STATUS_DIFF_INDEX_CMD;
+	char othercmd[SIZEOF_STR] = STATUS_LIST_OTHER_CMD;
 	unsigned long prev_lineno = view->lineno;
+	char indexstatus = 0;
 	size_t i;
 
 	for (i = 0; i < view->lines; i++)
@@ -3450,35 +3917,59 @@ status_open(struct view *view)
 	view->lines = view->line_alloc = view->line_size = view->lineno = 0;
 	view->line = NULL;
 
-	if (!realloc_lines(view, view->line_size + 6))
+	if (!realloc_lines(view, view->line_size + 7))
 		return FALSE;
 
-	if (!string_format(exclude, "%s/info/exclude", opt_git_dir))
+	add_line_data(view, NULL, LINE_STAT_HEAD);
+	if (opt_no_head)
+		string_copy(status_onbranch, "Initial commit");
+	else if (!*opt_head)
+		string_copy(status_onbranch, "Not currently on any branch");
+	else if (!string_format(status_onbranch, "On branch %s", opt_head))
 		return FALSE;
 
-	string_copy(cmd, STATUS_LIST_OTHER_CMD);
+	if (opt_no_head) {
+		string_copy(indexcmd, STATUS_LIST_NO_HEAD_CMD);
+		indexstatus = 'A';
+	}
+
+	if (!string_format(exclude, "%s/info/exclude", opt_git_dir))
+		return FALSE;
 
 	if (stat(exclude, &statbuf) >= 0) {
-		size_t cmdsize = strlen(cmd);
+		size_t cmdsize = strlen(othercmd);
+
+		if (!string_format_from(othercmd, &cmdsize, " %s", "--exclude-from=") ||
+		    sq_quote(othercmd, cmdsize, exclude) >= sizeof(othercmd))
+			return FALSE;
 
-		if (!string_format_from(cmd, &cmdsize, " %s", "--exclude-from=") ||
-		    sq_quote(cmd, cmdsize, exclude) >= sizeof(cmd))
+		cmdsize = strlen(indexcmd);
+		if (opt_no_head &&
+		    (!string_format_from(indexcmd, &cmdsize, " %s", "--exclude-from=") ||
+		     sq_quote(indexcmd, cmdsize, exclude) >= sizeof(indexcmd)))
 			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))
+	if (!status_run(view, indexcmd, indexstatus, LINE_STAT_STAGED) ||
+	    !status_run(view, STATUS_DIFF_FILES_CMD, 0, LINE_STAT_UNSTAGED) ||
+	    !status_run(view, othercmd, '?', LINE_STAT_UNTRACKED))
 		return FALSE;
 
 	/* If all went well restore the previous line number to stay in
-	 * the context. */
+	 * the context or select a line with something that can be
+	 * updated. */
+	if (prev_lineno >= view->lines)
+		prev_lineno = view->lines - 1;
+	while (prev_lineno < view->lines && !view->line[prev_lineno].data)
+		prev_lineno++;
+
+	/* If the above fails, always skip the "On branch" line. */
 	if (prev_lineno < view->lines)
 		view->lineno = prev_lineno;
 	else
-		view->lineno = view->lines - 1;
+		view->lineno = 1;
 
 	return TRUE;
 }
@@ -3487,14 +3978,16 @@ 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 (line->type == LINE_STAT_HEAD) {
+		wattrset(view->win, get_line_attr(LINE_STAT_HEAD));
+		wchgat(view->win, -1, 0, LINE_STAT_HEAD, NULL);
 
 	} else if (!status && line->type != LINE_STAT_NONE) {
 		wattrset(view->win, get_line_attr(LINE_STAT_SECTION));
@@ -3524,11 +4017,15 @@ status_draw(struct view *view, struct line *line, unsigned int lineno, bool sele
 			text = "    (no files)";
 			break;
 
+		case LINE_STAT_HEAD:
+			text = status_onbranch;
+			break;
+
 		default:
 			return FALSE;
 		}
 
-		draw_text(view, text, view->width, 0, TRUE, tilde_attr);
+		draw_text(view, text, view->width, TRUE, selected);
 		return TRUE;
 	}
 
@@ -3539,7 +4036,7 @@ status_draw(struct view *view, struct line *line, unsigned int lineno, bool sele
 	if (view->width < 5)
 		return TRUE;
 
-	draw_text(view, status->new.name, view->width - 5, 5, TRUE, tilde_attr);
+	draw_text(view, status->new.name, view->width - 5, TRUE, selected);
 	return TRUE;
 }
 
@@ -3575,9 +4072,18 @@ status_enter(struct view *view, struct line *line)
 
 	switch (line->type) {
 	case LINE_STAT_STAGED:
-		if (!string_format_from(opt_cmd, &cmdsize,
-					STATUS_DIFF_INDEX_SHOW_CMD, oldpath, newpath))
-			return REQ_QUIT;
+		if (opt_no_head) {
+			if (!string_format_from(opt_cmd, &cmdsize,
+						STATUS_DIFF_NO_HEAD_SHOW_CMD,
+						newpath))
+				return REQ_QUIT;
+		} else {
+			if (!string_format_from(opt_cmd, &cmdsize,
+						STATUS_DIFF_INDEX_SHOW_CMD,
+						oldpath, newpath))
+				return REQ_QUIT;
+		}
+
 		if (status)
 			info = "Staged changes to %s";
 		else
@@ -3598,7 +4104,6 @@ status_enter(struct view *view, struct line *line)
 		if (opt_pipe)
 			return REQ_QUIT;
 
-
 	    	if (!status) {
 			report("No file to show");
 			return REQ_NONE;
@@ -3608,6 +4113,9 @@ status_enter(struct view *view, struct line *line)
 		info = "Untracked file %s";
 		break;
 
+	case LINE_STAT_HEAD:
+		return REQ_NONE;
+
 	default:
 		die("line type %d not handled in switch", line->type);
 	}
@@ -3662,6 +4170,9 @@ status_update_file(struct view *view, struct status *status, enum line_type type
 		string_add(cmd, cmdsize, "git update-index -z --add --remove --stdin");
 		break;
 
+	case LINE_STAT_HEAD:
+		return TRUE;
+
 	default:
 		die("line type %d not handled in switch", type);
 	}
@@ -3682,7 +4193,7 @@ status_update_file(struct view *view, struct status *status, enum line_type type
 	return TRUE;
 }
 
-static void
+static bool
 status_update(struct view *view)
 {
 	struct line *line = &view->line[view->lineno];
@@ -3697,12 +4208,14 @@ status_update(struct view *view)
 
 		if (!line[-1].data) {
 			report("Nothing to update");
-			return;
+			return FALSE;
 		}
 
 	} else if (!status_update_file(view, line->data, line->type)) {
 		report("Failed to update file status");
 	}
+
+	return TRUE;
 }
 
 static enum request
@@ -3712,7 +4225,8 @@ status_request(struct view *view, enum request request, struct line *line)
 
 	switch (request) {
 	case REQ_STATUS_UPDATE:
-		status_update(view);
+		if (!status_update(view))
+			return REQ_NONE;
 		break;
 
 	case REQ_STATUS_MERGE:
@@ -3730,6 +4244,13 @@ status_request(struct view *view, enum request request, struct line *line)
 		open_editor(status->status != '?', status->new.name);
 		break;
 
+	case REQ_VIEW_BLAME:
+		if (status) {
+			string_copy(opt_file, status->new.name);
+			opt_ref[0] = 0;
+		}
+		return request;
+
 	case REQ_ENTER:
 		/* After returning the status view has been split to
 		 * show the stage view. No further reloading is
@@ -3777,6 +4298,7 @@ status_select(struct view *view, struct line *line)
 		text = "Press %s to stage %s for addition";
 		break;
 
+	case LINE_STAT_HEAD:
 	case LINE_STAT_NONE:
 		text = "Nothing to update";
 		break;
@@ -3948,7 +4470,7 @@ stage_update_chunk(struct view *view, struct line *line)
 static void
 stage_update(struct view *view, struct line *line)
 {
-	if (stage_line_type != LINE_STAT_UNTRACKED &&
+	if (!opt_no_head && 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");
@@ -3982,6 +4504,13 @@ stage_request(struct view *view, enum request request, struct line *line)
 		open_editor(stage_status.status != '?', stage_status.new.name);
 		break;
 
+	case REQ_VIEW_BLAME:
+		if (stage_status.new.name[0]) {
+			string_copy(opt_file, stage_status.new.name);
+			opt_ref[0] = 0;
+		}
+		return request;
+
 	case REQ_ENTER:
 		pager_request(view, request, line);
 		break;
@@ -4016,6 +4545,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 */
@@ -4221,7 +4751,6 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
 	enum line_type type;
 	int col = 0;
 	size_t timelen;
-	int tilde_attr;
 	int space;
 
 	if (!*commit->author)
@@ -4234,22 +4763,17 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
 		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);
 	}
 
 	if (opt_date) {
 		int n;
 
 		timelen = strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time);
-		n = draw_text(
-			view, buf, view->width - col, col, FALSE, tilde_attr);
-		draw_text(
-			view, " ", view->width - col - n, col + n, FALSE,
-			tilde_attr);
+		n = draw_text(view, buf, view->width - col, FALSE, selected);
+		draw_text(view, " ", view->width - col - n, FALSE, selected);
 
 		col += DATE_COLS;
 		wmove(view->win, lineno, col);
@@ -4265,8 +4789,7 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
 		max_len = view->width - col;
 		if (max_len > AUTHOR_COLS - 1)
 			max_len = AUTHOR_COLS - 1;
-		draw_text(
-			view, commit->author, max_len, col, TRUE, tilde_attr);
+		draw_text(view, commit->author, max_len, TRUE, selected);
 		col += AUTHOR_COLS;
 		if (col >= view->width)
 			return TRUE;
@@ -4302,6 +4825,8 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
 		do {
 			if (type == LINE_CURSOR)
 				;
+			else if (commit->refs[i]->head)
+				wattrset(view->win, get_line_attr(LINE_MAIN_HEAD));
 			else if (commit->refs[i]->ltag)
 				wattrset(view->win, get_line_attr(LINE_MAIN_LOCAL_TAG));
 			else if (commit->refs[i]->tag)
@@ -4311,20 +4836,13 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
 			else
 				wattrset(view->win, get_line_attr(LINE_MAIN_REF));
 
-			col += draw_text(
-				view, "[", view->width - col, col, TRUE,
-				tilde_attr);
-			col += draw_text(
-				view, commit->refs[i]->name, view->width - col,
-				col, TRUE, tilde_attr);
-			col += draw_text(
-				view, "]", view->width - col, col, TRUE,
-				tilde_attr);
+			col += draw_text(view, "[", view->width - col, TRUE, selected);
+			col += draw_text(view, commit->refs[i]->name, view->width - col,
+					 TRUE, selected);
+			col += draw_text(view, "]", view->width - col, TRUE, selected);
 			if (type != LINE_CURSOR)
 				wattrset(view->win, A_NORMAL);
-			col += draw_text(
-				view, " ", view->width - col, col, TRUE,
-				tilde_attr);
+			col += draw_text(view, " ", view->width - col, TRUE, selected);
 			if (col >= view->width)
 				return TRUE;
 		} while (commit->refs[i++]->next);
@@ -4333,9 +4851,7 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
 	if (type != LINE_CURSOR)
 		wattrset(view->win, get_line_attr(type));
 
-	col += draw_text(
-		view, commit->title, view->width - col, col, TRUE, tilde_attr);
-
+	draw_text(view, commit->title, view->width - col, TRUE, selected);
 	return TRUE;
 }
 
@@ -4368,6 +4884,12 @@ main_read(struct view *view, char *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;
 	}
 
@@ -4377,6 +4899,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;
 
@@ -4915,6 +5439,7 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen)
 	bool ltag = FALSE;
 	bool remote = FALSE;
 	bool check_replace = FALSE;
+	bool head = FALSE;
 
 	if (!strncmp(name, "refs/tags/", STRING_SIZE("refs/tags/"))) {
 		if (!strcmp(name + namelen - 3, "^{}")) {
@@ -4938,8 +5463,10 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen)
 	} else if (!strncmp(name, "refs/heads/", STRING_SIZE("refs/heads/"))) {
 		namelen -= STRING_SIZE("refs/heads/");
 		name	+= STRING_SIZE("refs/heads/");
+		head	 = !strncmp(opt_head, name, namelen);
 
 	} else if (!strcmp(name, "HEAD")) {
+		opt_no_head = FALSE;
 		return OK;
 	}
 
@@ -4967,6 +5494,7 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen)
 	ref->tag = tag;
 	ref->ltag = ltag;
 	ref->remote = remote;
+	ref->head = head;
 	string_copy_rev(ref->id, id);
 
 	return OK;
@@ -5014,20 +5542,36 @@ read_repo_info(char *name, size_t namelen, char *value, size_t valuelen)
 		 * Default to true for the unknown case. */
 		opt_is_inside_work_tree = strcmp(name, "false") ? TRUE : FALSE;
 
-	} else {
+	} else if (opt_cdup[0] == ' ') {
 		string_ncopy(opt_cdup, name, namelen);
+	} else {
+		if (!strncmp(name, "refs/heads/", STRING_SIZE("refs/heads/"))) {
+			namelen -= STRING_SIZE("refs/heads/");
+			name	+= STRING_SIZE("refs/heads/");
+			string_ncopy(opt_head, name, namelen);
+		}
 	}
 
 	return OK;
 }
 
-/* XXX: The line outputted by "--show-cdup" can be empty so the option
- * must be the last one! */
 static int
 load_repo_info(void)
 {
-	return read_properties(popen("git rev-parse --git-dir --is-inside-work-tree --show-cdup 2>/dev/null", "r"),
-			       "=", read_repo_info);
+	int result;
+	FILE *pipe = popen("git rev-parse --git-dir --is-inside-work-tree "
+			   " --show-cdup --symbolic-full-name HEAD 2>/dev/null", "r");
+
+	/* XXX: The line outputted by "--show-cdup" can be empty so
+	 * initialize it to something invalid to make it possible to
+	 * detect whether it has been set or not. */
+	opt_cdup[0] = ' ';
+
+	result = read_properties(pipe, "=", read_repo_info);
+	if (opt_cdup[0] == ' ')
+		opt_cdup[0] = 0;
+
+	return result;
 }
 
 static int