Merge branch 'jk/test-framework-updates'

diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index d0c62f7539f4c1d7e8c3ac39938d287b03ad4c28..719a11673bfc93463870d7d601eb3a0634b59b48 100755 (executable)
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -306,7 +306,7 @@ test_expect_success 'test --format medium' '
        test_cmp expected actual
 '
 
-test_expect_success 'test --format full' '
+test_expect_success 'test --format long' '
        {
                echo "$H1 (commit) -> $BLOB (blob)" &&
                echo "$BLOB (blob) -> $REPLACED (blob)" &&
@@ -314,7 +314,7 @@ test_expect_success 'test --format full' '
                echo "$PARA3 (commit) -> $S (commit)" &&
                echo "$MYTAG (tag) -> $HASH1 (commit)"
        } | sort >expected &&
-       git replace --format=full | sort > actual &&
+       git replace --format=long | sort > actual &&
        test_cmp expected actual
 '