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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 4, 2013, 20:45 UTC
Message-ID
<xmqqzjrsl3jl.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20130903071026.29838.52710.chriscool@tuxfamily.org>
Christian Couder <chriscool@tuxfamily.org> writes:
Show 23 quoted lines
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  Documentation/git-replace.txt | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
> index 736b48c..a2bd2ee 100644
> --- a/Documentation/git-replace.txt
> +++ b/Documentation/git-replace.txt
> @@ -21,10 +21,12 @@ replaced. The content of the 'replace' reference is the SHA-1 of the
>  replacement object.
>  
>  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.
> +
>  Replacement references will be used by default by all Git commands
>  except those doing reachability traversal (prune, pack transfer and
>  fsck).

And this should be in the same patch as the one that makes the code change.

Previous: Christian CouderNext: Junio C Hamano
Message 13 of 20 in “Check replacement object type and minor updates”
  1. 00/11 Check replacement object type and minor updatesChristian Couder, Sep 3, 2013
  2. 01/11 replace: forbid replacing an object with one of a different typeChristian Couder, Sep 3, 2013
  3. 02/11 Documentation/replace: state that objects must be of the same typeChristian Couder, Sep 3, 2013
  4. 03/11 t6050-replace: test that objects are of the same typeChristian Couder, Sep 3, 2013
  5. Junio C HamanoSep 4, 2013
  6. Christian CouderSep 5, 2013
  7. 04/11 t6050-replace: add test to clean up all the replace refsChristian Couder, Sep 3, 2013
  8. 05/11 Documentation/replace: add Creating Replacement Objects sectionChristian Couder, Sep 3, 2013
  9. 06/11 replace: bypass the type check if -f option is usedChristian Couder, Sep 3, 2013
  10. Junio C HamanoSep 4, 2013
  11. Christian CouderSep 5, 2013
  12. 07/11 Documentation/replace: tell that -f option bypasses the type checkChristian Couder, Sep 3, 2013
  13. Junio C HamanoSep 4, 2013
  14. Junio C HamanoSep 4, 2013
  15. 08/11 t6050-replace: check that -f option bypasses the type checkChristian Couder, Sep 3, 2013
  16. 09/11 replace: allow long option namesChristian Couder, Sep 3, 2013
  17. 10/11 Documentation/replace: list long option namesChristian Couder, Sep 3, 2013
  18. Junio C HamanoSep 4, 2013
  19. Christian CouderSep 5, 2013
  20. 11/11 t6050-replace: use some long option namesChristian Couder, Sep 3, 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.