diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-20 15:53:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-20 15:53:30 -0700 |
| commit | 0f360763c02d1230614e23f94fb298dab0162aa0 (patch) | |
| tree | 3c4645bcc34807e9a63b904ea163cc73b8ddd970 /t | |
| parent | a46034819ecce6872bff099f3d75589f4d38c00c (diff) | |
| parent | d4c813d47d5c4f821a6947a29e4a480ec6522f44 (diff) | |
| download | git-0f360763c02d1230614e23f94fb298dab0162aa0.tar.gz | |
Merge branch 'maint-1.7.8' into maint
* maint-1.7.8:
t/Makefile: Use $(sort ...) explicitly where needed
gitweb: Fix actionless dispatch for non-existent objects
i18n of multi-line advice messages
Diffstat (limited to 't')
| -rw-r--r-- | t/Makefile | 6 | ||||
| -rwxr-xr-x | t/t9500-gitweb-standalone-no-errors.sh | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/t/Makefile b/t/Makefile index 52a23fffc4..b5048ab77b 100644 --- a/t/Makefile +++ b/t/Makefile @@ -17,9 +17,9 @@ DEFAULT_TEST_TARGET ?= test # Shell quote; SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) -T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh) -TSVN = $(wildcard t91[0-9][0-9]-*.sh) -TGITWEB = $(wildcard t95[0-9][0-9]-*.sh) +T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)) +TSVN = $(sort $(wildcard t91[0-9][0-9]-*.sh)) +TGITWEB = $(sort $(wildcard t95[0-9][0-9]-*.sh)) all: $(DEFAULT_TEST_TARGET) diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh index 858a649cb6..90bb6050c1 100755 --- a/t/t9500-gitweb-standalone-no-errors.sh +++ b/t/t9500-gitweb-standalone-no-errors.sh @@ -475,6 +475,14 @@ test_expect_success \ 'gitweb_run "" "/.git/master:foo/"' test_expect_success \ + 'path_info: project/branch (non-existent)' \ + 'gitweb_run "" "/.git/non-existent"' + +test_expect_success \ + 'path_info: project/branch:filename (non-existent branch)' \ + 'gitweb_run "" "/.git/non-existent:non-existent"' + +test_expect_success \ 'path_info: project/branch:file (non-existent)' \ 'gitweb_run "" "/.git/master:non-existent"' |