Re: Poor status output during conflicted merge
Eric Raible <raible@gmail.com> writes:
Show 6 quoted lines
> 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
Junio C Hamano <gitster@pobox.com>