Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
t/t6050-replace.sh | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index decdc33..5c352c4 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -263,4 +263,17 @@ test_expect_success 'not just commits' '
test_cmp file.replaced file
'
+test_expect_success 'replaced and replacement objects must be of the same type' '
+ test_must_fail git replace mytag $HASH1 2>err &&
+ grep "mytag. points to a replaced object of type .tag" err &&
+ grep "$HASH1. points to a replacement object of type .commit" err &&
+ test_must_fail git replace HEAD^{tree} HEAD~1 2>err &&
+ grep "HEAD^{tree}. points to a replaced object of type .tree" err &&
+ grep "HEAD~1. points to a replacement object of type .commit" err &&
+ BLOB=$(git rev-parse :file) &&
+ test_must_fail git replace HEAD^ $BLOB 2>err &&
+ grep "HEAD^. points to a replaced object of type .commit" err &&
+ grep "$BLOB. points to a replacement object of type .blob" err
+'
+
test_done
--
1.8.4.rc1.31.g530f5ce.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html