1 files changed, 12 insertions, 19 deletions

diff --git a/wt-status.c b/wt-status.c
index 4b74e68584..9692dfa325 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -41,10 +41,8 @@ void wt_status_prepare(struct wt_status *s)
 
 	s->is_initial = get_sha1("HEAD", sha1) ? 1 : 0;
 
-	head = resolve_ref(git_path("HEAD"), sha1, 0);
-	s->branch = head ?
-		    strdup(head + strlen(get_git_dir()) + 1) :
-		    NULL;
+	head = resolve_ref("HEAD", sha1, 0, NULL);
+	s->branch = head ? xstrdup(head) : NULL;
 
 	s->reference = "HEAD";
 	s->amend = 0;
@@ -72,25 +70,25 @@ static void wt_status_print_filepair(int t, struct diff_filepair *p)
 	color_printf(color(WT_STATUS_HEADER), "#\t");
 	switch (p->status) {
 	case DIFF_STATUS_ADDED:
-		color_printf(c, "new file: %s", p->one->path); break;
+		color_printf(c, "new file:   %s", p->one->path); break;
 	case DIFF_STATUS_COPIED:
-		color_printf(c, "copied: %s -> %s",
+		color_printf(c, "copied:     %s -> %s",
 				p->one->path, p->two->path);
 		break;
 	case DIFF_STATUS_DELETED:
-		color_printf(c, "deleted: %s", p->one->path); break;
+		color_printf(c, "deleted:    %s", p->one->path); break;
 	case DIFF_STATUS_MODIFIED:
-		color_printf(c, "modified: %s", p->one->path); break;
+		color_printf(c, "modified:   %s", p->one->path); break;
 	case DIFF_STATUS_RENAMED:
-		color_printf(c, "renamed: %s -> %s",
+		color_printf(c, "renamed:    %s -> %s",
 				p->one->path, p->two->path);
 		break;
 	case DIFF_STATUS_TYPE_CHANGED:
 		color_printf(c, "typechange: %s", p->one->path); break;
 	case DIFF_STATUS_UNKNOWN:
-		color_printf(c, "unknown: %s", p->one->path); break;
+		color_printf(c, "unknown:    %s", p->one->path); break;
 	case DIFF_STATUS_UNMERGED:
-		color_printf(c, "unmerged: %s", p->one->path); break;
+		color_printf(c, "unmerged:   %s", p->one->path); break;
 	default:
 		die("bug: unhandled diff status %c", p->status);
 	}
@@ -156,10 +154,8 @@ void wt_status_print_initial(struct wt_status *s)
 static void wt_status_print_updated(struct wt_status *s)
 {
 	struct rev_info rev;
-	const char *argv[] = { NULL, NULL, NULL };
-	argv[1] = s->reference;
 	init_revisions(&rev, NULL);
-	setup_revisions(2, argv, &rev, NULL);
+	setup_revisions(0, NULL, &rev, s->reference);
 	rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 	rev.diffopt.format_callback = wt_status_print_updated_cb;
 	rev.diffopt.format_callback_data = s;
@@ -170,9 +166,8 @@ static void wt_status_print_updated(struct wt_status *s)
 static void wt_status_print_changed(struct wt_status *s)
 {
 	struct rev_info rev;
-	const char *argv[] = { NULL, NULL };
 	init_revisions(&rev, "");
-	setup_revisions(1, argv, &rev, NULL);
+	setup_revisions(0, NULL, &rev, NULL);
 	rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 	rev.diffopt.format_callback = wt_status_print_changed_cb;
 	rev.diffopt.format_callback_data = s;
@@ -227,10 +222,8 @@ static void wt_status_print_untracked(const struct wt_status *s)
 static void wt_status_print_verbose(struct wt_status *s)
 {
 	struct rev_info rev;
-	const char *argv[] = { NULL, NULL, NULL };
-	argv[1] = s->reference;
 	init_revisions(&rev, NULL);
-	setup_revisions(2, argv, &rev, NULL);
+	setup_revisions(0, NULL, &rev, s->reference);
 	rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 	rev.diffopt.detect_rename = 1;
 	run_diff_index(&rev, 1);