git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check

From
Christian Couder <chriscool@tuxfamily.org>
Date
Sep 1, 2013, 11:49 UTC
Message-ID
<20130901.134900.829124962244710553.chriscool@tuxfamily.org>
In-Reply-To
<70F5C527E29F43A9BE85694F560E01A9@PhilipOakley>
From: "Philip Oakley" <philipoakley@iee.org>
Show 17 quoted lines
>
> 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.

Previous: Philip OakleyNext: Philip Oakley
Message 15 of 33 in “Check replacement object type and minor updates”
  1. 00/11 Check replacement object type and minor updatesChristian Couder, Aug 31, 2013
  2. 01/11 replace: forbid replacing an object with one of a different typeChristian Couder, Aug 31, 2013
  3. Philip OakleyAug 31, 2013
  4. Christian CouderSep 1, 2013
  5. Philip OakleySep 1, 2013
  6. 02/11 Documentation/replace: state that objects must be of the same typeChristian Couder, Aug 31, 2013
  7. 03/11 t6050-replace: test that objects are of the same typeChristian Couder, Aug 31, 2013
  8. 04/11 t6050-replace: add test to clean up all the replace refsChristian Couder, Aug 31, 2013
  9. 05/11 Documentation/replace: add Creating Replacement Objects sectionChristian Couder, Aug 31, 2013
  10. Philip OakleyAug 31, 2013
  11. Christian CouderSep 1, 2013
  12. 06/11 replace: bypass the type check if -f option is usedChristian Couder, Aug 31, 2013
  13. 07/11 Documentation/replace: tell that -f option bypasses the type checkChristian Couder, Aug 31, 2013
  14. Philip OakleyAug 31, 2013
  15. Christian CouderSep 1, 2013
  16. Philip OakleySep 1, 2013
  17. Christian CouderSep 2, 2013
  18. Philip OakleySep 2, 2013
  19. Jonathan NiederSep 2, 2013
  20. Philip OakleySep 2, 2013
  21. Jonathan NiederSep 2, 2013
  22. Philip OakleySep 2, 2013
  23. Christian CouderSep 3, 2013
  24. 08/11 t6050-replace: check that -f option bypasses the type checkChristian Couder, Aug 31, 2013
  25. Eric SunshineSep 1, 2013
  26. Christian CouderSep 1, 2013
  27. 09/11 replace: allow long option namesChristian Couder, Aug 31, 2013
  28. 10/11 Documentation/replace: list long option namesChristian Couder, Aug 31, 2013
  29. 11/11 t6050-replace: use some long option namesChristian Couder, Aug 31, 2013
  30. Philip OakleyAug 31, 2013
  31. Christian CouderSep 1, 2013
  32. Eric SunshineSep 1, 2013
  33. Christian CouderSep 1, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.