From: demerphq <demerphq@gmail.com>
To: Eric Raible <raible@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: Poor status output during conflicted merge
Date: Wed, 7 Jul 2010 14:43:48 +0200 [thread overview]
Message-ID: <AANLkTinlLQEQuvX5zTmj6ulsnLdyzyuIdZC7fR4am0pC@mail.gmail.com> (raw)
In-Reply-To: <AANLkTimBQULqlIVLOOpFoOO5Lg7hGrgm7N69qouafFyG@mail.gmail.com>
On 7 July 2010 02:12, Eric Raible <raible@gmail.com> wrote:
> On Thu, Jul 1, 2010 at 5:00 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> 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
>
> I suppose that's better than nothing, but I can't help but think that
> the output would be more useful if it explicitly mentioned the merge.
>
> Most sensible people probably already have that in their bash prompt,
> of course, but we have some users at $dayjob who use the anemic
> windows cmd.exe as their "command shell".
>
> So how about something like this:
>
> $ git status
> # Merging branch 'master' into topic
> # Changes to be committed:
> #
> # modified: file2
>
> The "branch 'master' into topic" part can come
> from .git/MERGE_MSG
+1
--
perl -Mre=debug -e "/just|another|perl|hacker/"
prev parent reply other threads:[~2010-07-07 12:43 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
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 [this message]
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=AANLkTinlLQEQuvX5zTmj6ulsnLdyzyuIdZC7fR4am0pC@mail.gmail.com \
--to=demerphq@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).