From: Christian Couder Date: Sat, 28 Jun 2014 18:11:11 GMT Subject: [PATCH v5 2/7] replace: add test for --graft Message-ID: <20140628181117.5687.23923.chriscool@tuxfamily.org> In-Reply-To: <20140628171731.5687.30308.chriscool@tuxfamily.org> Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- t/t6050-replace.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 68b3cb2..ca45a84 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -351,4 +351,16 @@ test_expect_success 'replace ref cleanup' ' test -z "$(git replace)" ' +test_expect_success '--graft with and without already replaced object' ' + test $(git log --oneline | wc -l) = 7 && + git replace --graft $HASH5 && + test $(git log --oneline | wc -l) = 3 && + git cat-file -p $HASH5 | test_must_fail grep parent && + test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 && + git replace --force -g $HASH5 $HASH4 $HASH3 && + git cat-file -p $HASH5 | grep "parent $HASH4" && + git cat-file -p $HASH5 | grep "parent $HASH3" && + git replace -d $HASH5 +' + test_done -- 2.0.0.421.g786a89d.dirty