diff options
| author | Ann T Ropea <bedhanger@gmx.de> | 2017-11-13 23:36:54 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-14 15:44:40 +0900 |
| commit | 1e29f6077da6e192c3ddc0cea1d4c64e7ef39e6f (patch) | |
| tree | e81d27e7221e7b37b640208a9c90b19a1aa6d0d1 | |
| parent | 61f8c9f2cd46535a657d41ca31b1bf7e43e522be (diff) | |
| download | git-ar/ellipsis.tar.gz | |
Testing: provide tests requiring them with ellipses after SHA-1 valuesar/ellipsis
Where needed, we arrange for invocations of Git as if
"-c core.printsha1ellipsis=true"
had been specified on the command-line. This furnishes ellipses in the
output which then matches what is expected.
Signed-off-by: Ann T Ropea <bedhanger@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3040-subprojects-basic.sh | 12 | ||||
| -rwxr-xr-x | t/t4013-diff-various.sh | 12 | ||||
| -rwxr-xr-x | t/t9300-fast-import.sh | 12 |
3 files changed, 36 insertions, 0 deletions
diff --git a/t/t3040-subprojects-basic.sh b/t/t3040-subprojects-basic.sh index 0a4ff6d824..63b85bfdd4 100755 --- a/t/t3040-subprojects-basic.sh +++ b/t/t3040-subprojects-basic.sh @@ -3,6 +3,18 @@ test_description='Basic subproject functionality' . ./test-lib.sh +# Some of the tests expect an ellipsis after the (abbreviated) +# SHA-1 value. The code below results in Git being called with +# "-c core.printsha1ellipsis=true" which satisfies those tests. +do_print_sha1_ellipsis="'core.printsha1ellipsis=true'" +if test -z "${GIT_CONFIG_PARAMETERS}" +then + GIT_CONFIG_PARAMETERS="${do_print_sha1_ellipsis}" +else + GIT_CONFIG_PARAMETERS="${GIT_CONFIG_PARAMETERS} ${do_print_sha1_ellipsis}" +fi +export GIT_CONFIG_PARAMETERS + test_expect_success 'setup: create superproject' ' : >Makefile && git add Makefile && diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index c515e3e53f..8ee14c7c67 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -7,6 +7,18 @@ test_description='Various diff formatting options' . ./test-lib.sh +# Some of the tests expect an ellipsis after the (abbreviated) +# SHA-1 value. The code below results in Git being called with +# "-c core.printsha1ellipsis=true" which satisfies those tests. +do_print_sha1_ellipsis="'core.printsha1ellipsis=true'" +if test -z "${GIT_CONFIG_PARAMETERS}" +then + GIT_CONFIG_PARAMETERS="${do_print_sha1_ellipsis}" +else + GIT_CONFIG_PARAMETERS="${GIT_CONFIG_PARAMETERS} ${do_print_sha1_ellipsis}" +fi +export GIT_CONFIG_PARAMETERS + LF=' ' diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index d47560b634..6cc41b90da 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -7,6 +7,18 @@ test_description='test git fast-import utility' . ./test-lib.sh . "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash +# Some of the tests expect an ellipsis after the (abbreviated) +# SHA-1 value. The code below results in Git being called with +# "-c core.printsha1ellipsis=true" which satisfies those tests. +do_print_sha1_ellipsis="'core.printsha1ellipsis=true'" +if test -z "${GIT_CONFIG_PARAMETERS}" +then + GIT_CONFIG_PARAMETERS="${do_print_sha1_ellipsis}" +else + GIT_CONFIG_PARAMETERS="${GIT_CONFIG_PARAMETERS} ${do_print_sha1_ellipsis}" +fi +export GIT_CONFIG_PARAMETERS + verify_packs () { for p in .git/objects/pack/*.pack do |