From 98bf8a47c296f51ea9722fef4bb81dbfb70cd4bb Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20R=C3=BChle?= Date: Tue, 2 Jan 2007 20:26:23 +0100 Subject: [PATCH] Support --amend on initial commit in status output MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We check the existence of the parent commit to determine whether the status is requested for an initial commit. Since the parent commit depends on the presence of the --amend switch do initial commit detection after command line arguments have been handled. Signed-off-by: Jürgen Rühle Signed-off-by: Junio C Hamano --- wt-status.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wt-status.c b/wt-status.c index ca4690e86..9b777a569 100644 --- a/wt-status.c +++ b/wt-status.c @@ -41,8 +41,6 @@ void wt_status_prepare(struct wt_status *s) unsigned char sha1[20]; const char *head; - s->is_initial = get_sha1("HEAD", sha1) ? 1 : 0; - head = resolve_ref("HEAD", sha1, 0, NULL); s->branch = head ? xstrdup(head) : NULL; @@ -277,6 +275,9 @@ static void wt_status_print_verbose(struct wt_status *s) void wt_status_print(struct wt_status *s) { + unsigned char sha1[20]; + s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0; + if (s->branch) color_printf_ln(color(WT_STATUS_HEADER), "# On branch %s", s->branch); -- 2.30.2