From: Wayne Scott <wsc9tt@gmail.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: bogus merges
Date: Tue, 6 Sep 2005 08:08:57 -0500 [thread overview]
Message-ID: <59a6e58305090606082a23b048@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0509050853080.3568@evo.osdl.org>
On 9/5/05, Linus Torvalds <torvalds@osdl.org> wrote:
> > Really 'git commit' should detect problems like this automatically and
> > prevent them from getting in the tree.
>
> Well, that would depend on having the fixed git-merge-base in the first
> place, which in turn would mean that such a commit wouldn't happen at all,
> so it's kind of circular. It's not worth fixing anywhere else, since once
> you fix it in git-merge-base, it just becomes a non-issue.
This just error checking to prevent future bugs from getting committed
to the tree. These kinds of things are very hard to repair after the
fact.
-Wayne
next prev parent reply other threads:[~2005-09-06 13:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-05 14:38 bogus merges Wayne Scott
2005-09-05 16:01 ` Linus Torvalds
2005-09-06 13:08 ` Wayne Scott [this message]
2005-09-11 11:06 ` Russell King
2005-09-06 18:28 ` Daniel Barkalow
2005-09-11 11:01 ` Russell King
2005-09-11 18:08 ` Daniel Barkalow
2005-09-12 0:58 ` Petr Baudis
2005-09-11 10:21 ` Russell King
2005-09-11 11:48 ` Martin Langhoff
2005-09-11 15:11 ` A Large Angry SCM
2005-09-11 18:36 ` Russell King
2005-09-11 18:00 ` Russell King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=59a6e58305090606082a23b048@mail.gmail.com \
--to=wsc9tt@gmail.com \
--cc=git@vger.kernel.org \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.