From: Brian Gerst <bgerst@didntduck.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Kay Sievers <kay.sievers@suse.de>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: gitweb using "--cc"?
Date: Wed, 08 Feb 2006 21:13:52 -0500 [thread overview]
Message-ID: <43EAA560.8030504@didntduck.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0602081532360.2458@g5.osdl.org>
Linus Torvalds wrote:
> I just did an arm merge that needed some (very trivial) manual fixups
> (commit ID cce0cac1, in case anybody cares).
>
> As usual, git-diff-tree --cc does a beautiful job on it, but I also
> checked the gitweb output, which seems to not do as well (the commit
> message about a manual conflict merge doesn't make any sense at all).
>
> Now, in this case, what gitweb shows is actually "sensible": it will show
> the diff of what the merge "brought in" to the mainline kernel, and in
> that sense I can certainly understand it. It basically diffs the merge
> against the first parent.
>
> So looking at that particular example, arguably gitweb does something
> "different" from what the commit message is talking about, but in many
> ways it's a perfectly logical thing.
>
> However, diffing against the first parent, while it sometimes happens to
> be a sane thing to do, really isn't very sane in general. The merge may go
> the other way (subdevelopers merging my code), like in commit b2faf597,
> and sometimes there might not be a single reference tree, but more of a
> "couple of main branches" approach with merging back and forth). Then the
> current gitweb behaviour makes no sense at all.
>
> So it would be much nicer if gitweb had some alternate approach to showing
> merge diffs. My suggested approach would be to just let the user choose:
> have separate "diff against fist/second[/third[/..]] parent" buttons. And
> one of the choices would be the "conflict view" that git-diff-tree --cc
> gives (I'd argue for that being the default one, because it's the only one
> that doesn't have a "preferred parent").
>
> Kay?
>
> Linus
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
git-whatchanged doesn't show that merge commit either.
--
Brian Gerst
next prev parent reply other threads:[~2006-02-09 2:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-08 23:44 gitweb using "--cc"? Linus Torvalds
2006-02-08 23:57 ` Junio C Hamano
2006-02-09 0:01 ` [PATCH] Use describe to come up with the closest tag Junio C Hamano
2006-02-09 0:02 ` [PATCH] Allow using --cc when showing a merge Junio C Hamano
2006-02-09 2:13 ` Brian Gerst [this message]
2006-02-09 2:26 ` gitweb using "--cc"? Linus Torvalds
2006-02-09 3:14 ` Junio C Hamano
2006-02-09 16:35 ` Linus Torvalds
2006-02-09 16:42 ` Linus Torvalds
2006-02-09 18:30 ` Linus Torvalds
2006-02-09 19:41 ` Junio C Hamano
2006-02-09 20:27 ` Linus Torvalds
2006-02-09 20:37 ` Linus Torvalds
2006-02-09 20:47 ` Junio C Hamano
2006-02-09 20:52 ` Junio C Hamano
2006-02-09 21:53 ` Junio C Hamano
2006-02-09 22:00 ` Junio C Hamano
2006-02-09 22:26 ` Junio C Hamano
2006-02-11 9:17 ` Marco Costalba
2006-02-11 19:32 ` Junio C Hamano
2006-02-11 20:59 ` Junio C Hamano
2006-02-09 20:38 ` Junio C Hamano
2006-02-09 20:50 ` Linus Torvalds
2006-02-09 21:11 ` Junio C Hamano
2006-02-10 11:00 ` [PATCH] combine-diff: Record diff status a bit more faithfully Junio C Hamano
2006-02-09 23:49 ` [PATCH] combine-diff: move formatting logic to show_combined_diff() Junio C Hamano
2006-02-09 3:13 ` gitweb using "--cc"? Kay Sievers
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=43EAA560.8030504@didntduck.org \
--to=bgerst@didntduck.org \
--cc=git@vger.kernel.org \
--cc=kay.sievers@suse.de \
--cc=torvalds@osdl.org \
/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).