diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2013-12-28 12:00:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-30 12:33:11 -0800 |
| commit | 663a8566beb5387530641abe71a8d8b2dafd08b3 (patch) | |
| tree | 5d67411eef51e8afa398daefa7ae96615cb7c853 /t/t6050-replace.sh | |
| parent | 34a332221c581585ad06ed43eff12fb7e675cc1d (diff) | |
| download | git-663a8566beb5387530641abe71a8d8b2dafd08b3.tar.gz | |
replace info: rename 'full' to 'long' and clarify in-code symbolscc/replace-object-info
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=<name>" to 'long', to
match others (i.e. 'short' and 'medium').
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6050-replace.sh')
| -rwxr-xr-x | t/t6050-replace.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 ' |