From: Junio C Hamano <gitster@pobox.com>
To: Stephen Boyd <bebarino@gmail.com>
Cc: git@vger.kernel.org, Jari Aalto <jari.aalto@cante.net>
Subject: Re: [PATCH 1/3] octopus: make merge process simpler to follow
Date: Sat, 12 Dec 2009 00:53:03 -0800 [thread overview]
Message-ID: <7vljh8vaj4.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1260578339-30750-1-git-send-email-bebarino@gmail.com> (Stephen Boyd's message of "Fri\, 11 Dec 2009 16\:38\:57 -0800")
Stephen Boyd <bebarino@gmail.com> writes:
> Its not very easy to understand what heads are being merged given
> the current output of an octopus merge. Fix this by replacing the
> sha1 with the (usually) better description in GITHEAD_<SHA1>.
>
> Suggested-by: Jari Aalto <jari.aalto@cante.net>
> Signed-off-by: Stephen Boyd <bebarino@gmail.com>
> ---
>
> Maybe this will work? At least it will replace the sha1 with
> whatever is given on the command line.
This shows what was given from the command line instead of the
commit object name. I think it makes sense to not even make this
dependent on any option. Also I don't think anybody misses the
commit object name in the output---after all, that is all internal
to git and is different from what the user gave us anyway (unless
the user did give us the full 40-char object name, in which case
the value of GITHEAD_<SHA1> would be that name, and we will show it,
which is also fine).
No, I haven't applied nor run it yet. The above is purely from my cursory
reading of the code.
Anyway, I'll keep this in my inbox or queue it on 'pu' if I had time.
next prev parent reply other threads:[~2009-12-12 8:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-11 18:55 FEATURE REQUEST: Announce branch name with merge comamnd Jari Aalto
2009-12-11 19:33 ` Junio C Hamano
2009-12-12 0:38 ` [PATCH 1/3] octopus: make merge process simpler to follow Stephen Boyd
2009-12-12 8:53 ` Junio C Hamano [this message]
2009-12-12 19:56 ` Johannes Sixt
2009-12-12 20:46 ` Junio C Hamano
2009-12-15 6:49 ` [PATCH] " Stephen Boyd
2009-12-15 7:32 ` Junio C Hamano
2009-12-15 7:35 ` Stephen Boyd
2009-12-12 0:38 ` [PATCH 2/3] octopus: reenable fast-forward merges Stephen Boyd
2009-12-12 0:38 ` [PATCH 3/3] octopus: remove dead code Stephen Boyd
2009-12-12 1:01 ` Junio C Hamano
2009-12-12 1:35 ` FEATURE REQUEST: Announce branch name with merge comamnd Alex Riesen
2009-12-12 8:35 ` Jari Aalto
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=7vljh8vaj4.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bebarino@gmail.com \
--cc=git@vger.kernel.org \
--cc=jari.aalto@cante.net \
/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).