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

2013-09-05 Thread Philip Oakley
From: Philip Oakley philipoak...@iee.org Sent: Saturday, August 31, 2013 11:16 PM From: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git

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

2013-09-05 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: From: Philip Oakley philipoak...@iee.org Sent: Saturday, August 31, 2013 11:16 PM From: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 4 +++- 1 file changed, 3

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

2013-09-03 Thread Christian Couder
On Mon, Sep 2, 2013 at 11:50 PM, Philip Oakley philipoak...@iee.org wrote: From: Christian Couder chrisc...@tuxfamily.org You mean something like the following: $ cat ./graft2replace.sh #!/bin/bash while read orig parents do printf %s git cat-file commit $orig printf %s

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

2013-09-02 Thread Philip Oakley
From: Christian Couder chrisc...@tuxfamily.org From: Philip Oakley philipoak...@iee.org From: Christian Couder chrisc...@tuxfamily.org 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,

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

2013-09-02 Thread Jonathan Nieder
Hi, Philip Oakley wrote: Does `hash-object` do the inverese of `cat-file commit`? I didn't find the hash-object(1) man page very informative on that matter Hm. The manpage says: Computes the object ID value for an object with specified type with the contents of the named

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

2013-09-02 Thread Philip Oakley
From: Jonathan Nieder jrnie...@gmail.com Hi, Philip Oakley wrote: Does `hash-object` do the inverese of `cat-file commit`? I didn't find the hash-object(1) man page very informative on that matter Hm. The manpage says: Computes the object ID value for an object with specified type with

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

2013-09-02 Thread Jonathan Nieder
Philip Oakley wrote: The problem is the file format, in the sense that the earlier `git cat-file commit $orig` has a human readable output which is a description of the commit header, rather than the specific binary content. Ah. That's the actual raw commit object format, though. The

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

2013-09-02 Thread Philip Oakley
From: Jonathan Nieder jrnie...@gmail.com Philip Oakley wrote: The problem is the file format, in the sense that the earlier `git cat-file commit $orig` has a human readable output which is a description of the commit header, rather than the specific binary content. Ah. That's the actual

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

2013-09-01 Thread Christian Couder
From: Philip Oakley philipoak...@iee.org From: Christian Couder chrisc...@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'

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

2013-09-01 Thread Philip Oakley
From: Christian Couder chrisc...@tuxfamily.org From: Philip Oakley philipoak...@iee.org From: Christian Couder chrisc...@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

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

2013-08-31 Thread Christian Couder
Signed-off-by: Christian Couder chrisc...@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 +++

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

2013-08-31 Thread Philip Oakley
From: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Christian Couder chrisc...@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