git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Eric Raible <raible@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Poor status output during conflicted merge
Date: Thu, 01 Jul 2010 17:00:12 -0700	[thread overview]
Message-ID: <7v1vbm3g8j.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <loom.20100701T195742-266@post.gmane.org> (Eric Raible's message of "Thu\, 1 Jul 2010 18\:16\:29 +0000 \(UTC\)")

Eric Raible <raible@gmail.com> writes:

> A 'git status' at this point gives the following output:
>
> # On branch topic
> nothing to commit (working directory clean)
>
> Which is wrong, since the merge still needs to be committed.

It might be just a simple matter of ...

 wt-status.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/wt-status.c b/wt-status.c
index 2f9e33c..757536f 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -674,6 +674,8 @@ void wt_status_print(struct wt_status *s)
 			fprintf(s->fp, "# No changes\n");
 		else if (s->nowarn)
 			; /* nothing */
+		else if (s->in_merge)
+			printf("merge result will be the same as HEAD commit\n");
 		else if (s->workdir_dirty)
 			printf("no changes added to commit%s\n",
 				advice_status_hints

  reply	other threads:[~2010-07-02  0:00 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-01 18:16 Poor status output during conflicted merge Eric Raible
2010-07-02  0:00 ` Junio C Hamano [this message]
2010-07-02  1:51   ` Eric Raible
2010-07-07  0:12   ` Eric Raible
2010-07-07  5:07     ` Elijah Newren
2010-07-07 12:43     ` demerphq

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7v1vbm3g8j.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=raible@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).