From: Christian Couder <chriscool@tuxfamily.org>
To: philipoakley@iee.org
Cc: gitster@pobox.com, git@vger.kernel.org, trast@inf.ethz.ch, j6t@kdbg.org
Subject: Re: [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check
Date: Sun, 01 Sep 2013 13:49:00 +0200 (CEST) [thread overview]
Message-ID: <20130901.134900.829124962244710553.chriscool@tuxfamily.org> (raw)
In-Reply-To: <70F5C527E29F43A9BE85694F560E01A9@PhilipOakley>
From: "Philip Oakley" <philipoakley@iee.org>
>
> From: "Christian Couder" <chriscool@tuxfamily.org>
>>
>> The replaced object and the replacement object must be of the same
>> type.
>> -There is no other restriction on them.
>> +This restriction can be bypassed using `-f`.
>>
>> Unless `-f` is given, the 'replace' reference must not yet exist.
>>
>> +There is no other restriction on the replaced and replacement
>> objects.
>
> Is this trying to allude to the fact that merge commits may be
> exchanged with non-merge commits? I strongly believe that this ability
> to exchange merge and non-merge commits should be stated _explicitly_
> to counteract the false beliefs that are listed out on the internet.
Maybe we can show that in an example. But I think the patch is quite
clear as it is and should be enough.
If we really want to correct some false beliefs, the best would be to
state the truth where those false beliefs are stated.
> It's probably better stated in a separate patch for that explicit
> purpose to avoid mixed messages within this commit.
If people agree, I will add a another patch with an example in an
EXAMPLE section.
Thanks,
Christian.
next prev parent reply other threads:[~2013-09-01 11:49 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-31 19:12 [PATCH v3 00/11] Check replacement object type and minor updates Christian Couder
2013-08-31 19:12 ` [PATCH v3 01/11] replace: forbid replacing an object with one of a different type Christian Couder
2013-08-31 22:11 ` Philip Oakley
2013-09-01 11:53 ` Christian Couder
2013-09-01 19:26 ` Philip Oakley
2013-08-31 19:12 ` [PATCH v3 02/11] Documentation/replace: state that objects must be of the same type Christian Couder
2013-08-31 19:12 ` [PATCH v3 03/11] t6050-replace: test that objects are " Christian Couder
2013-08-31 19:12 ` [PATCH v3 04/11] t6050-replace: add test to clean up all the replace refs Christian Couder
2013-08-31 19:12 ` [PATCH v3 05/11] Documentation/replace: add Creating Replacement Objects section Christian Couder
2013-08-31 22:19 ` Philip Oakley
2013-09-01 10:27 ` Christian Couder
2013-08-31 19:12 ` [PATCH v3 06/11] replace: bypass the type check if -f option is used Christian Couder
2013-08-31 19:12 ` [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check Christian Couder
2013-08-31 22:16 ` Philip Oakley
2013-09-01 11:49 ` Christian Couder [this message]
2013-09-01 20:11 ` Philip Oakley
2013-09-02 6:11 ` Christian Couder
2013-09-02 21:50 ` Philip Oakley
2013-09-02 21:55 ` Jonathan Nieder
2013-09-02 22:13 ` Philip Oakley
2013-09-02 22:26 ` Jonathan Nieder
2013-09-02 22:45 ` Philip Oakley
2013-09-03 9:29 ` Christian Couder
2013-08-31 19:12 ` [PATCH v3 08/11] t6050-replace: check " Christian Couder
2013-09-01 7:50 ` Eric Sunshine
2013-09-01 10:02 ` Christian Couder
2013-08-31 19:12 ` [PATCH v3 09/11] replace: allow long option names Christian Couder
2013-08-31 19:12 ` [PATCH v3 10/11] Documentation/replace: list " Christian Couder
2013-08-31 19:12 ` [PATCH v3 11/11] t6050-replace: use some " Christian Couder
2013-08-31 22:19 ` Philip Oakley
2013-09-01 10:11 ` Christian Couder
2013-09-01 8:07 ` Eric Sunshine
2013-09-01 10:01 ` Christian Couder
-- strict thread matches above, loose matches on Subject: below --
2013-09-05 22:20 [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check Philip Oakley
2013-09-05 23:13 ` Junio C Hamano
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=20130901.134900.829124962244710553.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=philipoakley@iee.org \
--cc=trast@inf.ethz.ch \
/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 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 NNTP newsgroup(s).