git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Philip Oakley <philipoakley@iee.org>,
	Thomas Rast <trast@inf.ethz.ch>, Johannes Sixt <j6t@kdbg.org>
Subject: [PATCH v3 02/11] Documentation/replace: state that objects must be of the same type
Date: Sat, 31 Aug 2013 21:12:05 +0200	[thread overview]
Message-ID: <20130831191215.26699.99775.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20130831190528.26699.33964.chriscool@tuxfamily.org>

A previous patch ensures that both the replaced and the replacement
objects passed to git replace must be of the same type.

While at it state that there is no other restriction on both objects.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 Documentation/git-replace.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index e0b4057..aa66d27 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt
@@ -20,6 +20,9 @@ The name of the 'replace' reference is the SHA-1 of the object that is
 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.
+
 Unless `-f` is given, the 'replace' reference must not yet exist.
 
 Replacement references will be used by default by all Git commands
@@ -69,9 +72,7 @@ go back to a replaced commit will move the branch to the replacement
 commit instead of the replaced commit.
 
 There may be other problems when using 'git rev-list' related to
-pending objects. And of course things may break if an object of one
-type is replaced by an object of another type (for example a blob
-replaced by a commit).
+pending objects.
 
 SEE ALSO
 --------
-- 
1.8.4.rc1.31.g530f5ce.dirty

  parent reply	other threads:[~2013-08-31 19:13 UTC|newest]

Thread overview: 33+ 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 ` Christian Couder [this message]
2013-08-31 19:12 ` [PATCH v3 03/11] t6050-replace: test that objects are of the same type 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
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

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=20130831191215.26699.99775.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).