From 663a8566beb5387530641abe71a8d8b2dafd08b3 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 28 Dec 2013 12:00:05 +0100 Subject: replace info: rename 'full' to 'long' and clarify in-code symbols Enum names SHORT/MEDIUM/FULL were too broad to be descriptive. And they clashed with built-in symbols on platforms like Windows. Clarify by giving them REPLACE_FORMAT_ prefix. Rename 'full' format in "git replace --format=" to 'long', to match others (i.e. 'short' and 'medium'). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- t/t6050-replace.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't') diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index d0c62f7539..719a11673b 100755 --- 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 ' -- cgit v1.2.3