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

I've added a sub-comment to the original SO post that started this thread (my post $gmane/231598 - SO/a/18027030/717355), but given the guy's blog has comments going back to 2009 I suspect its a bit of a http://xkcd.com/386/ task, hence my desire that it's explicitly mentioned in the 'replace' documentation. In addition, if the guy doesn't correct his post I'll mark it down in a couple of days to make it plain to other readers it's in error.

The creation of a (merge?) commit that's equivalent to a graft line isn't something that jumps out (to me) as an easy couple lines of bash script.

A 'graft2replace' script (or 'git-graft' command) which takes an existing graft file (or command line list) and creates the replacement objects and then does the replace, all while still in a dirty tree would be the holy grail for properly deprecating grafts (which are sooo easy to create)

Show 10 quoted lines
>> 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.
>
>

Thanks for your work on this. Philip

Previous: Christian CouderNext: Christian Couder
Message 16 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.