From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v4 02/11] Documentation/replace: state that objects must be of the same type Date: Tue, 03 Sep 2013 09:10:16 +0200 Message-ID: <20130903071026.29838.93434.chriscool@tuxfamily.org> References: <20130903070551.29838.43576.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Philip Oakley , Thomas Rast , Johannes Sixt , Eric Sunshine , Jonathan Nieder To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Sep 03 09:17:52 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VGks3-0008IL-Ud for gcvg-git-2@plane.gmane.org; Tue, 03 Sep 2013 09:17:52 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932535Ab3ICHRU (ORCPT ); Tue, 3 Sep 2013 03:17:20 -0400 Received: from mail-1y.bbox.fr ([194.158.98.14]:53217 "EHLO mail-1y.bbox.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932528Ab3ICHRS (ORCPT ); Tue, 3 Sep 2013 03:17:18 -0400 Received: from [127.0.1.1] (cha92-h01-128-78-31-246.dsl.sta.abo.bbox.fr [128.78.31.246]) by mail-1y.bbox.fr (Postfix) with ESMTP id 2C6AC40; Tue, 3 Sep 2013 09:17:17 +0200 (CEST) X-git-sha1: cd728c653560718e4184097dc4e7ce9c3432e8a0 X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20130903070551.29838.43576.chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- 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