diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-28 14:47:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-28 14:47:24 -0700 |
| commit | 89740333e8d398f1da701e9023675321bbb9a85b (patch) | |
| tree | 47427bee5ebcc3b42699f12580dc299ad2f312c5 | |
| parent | c85f0a2a0e399cf88f318113225700693a6039a2 (diff) | |
| parent | 240ae2b8c96c3b9836d516de36dacd65bea9c4a2 (diff) | |
| download | git-89740333e8d398f1da701e9023675321bbb9a85b.tar.gz | |
Merge branch 'maint'
* maint:
documentation: trivial whitespace cleanups
t/Makefile: remove smoke test targets
| -rw-r--r-- | Documentation/config.txt | 12 | ||||
| -rw-r--r-- | t/Makefile | 38 |
2 files changed, 6 insertions, 44 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c67038b56d..6e53fc5074 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1104,11 +1104,11 @@ format.thread:: value disables threading. format.signoff:: - A boolean value which lets you enable the `-s/--signoff` option of - format-patch by default. *Note:* Adding the Signed-off-by: line to a - patch should be a conscious act and means that you certify you have - the rights to submit this work under the same open source license. - Please see the 'SubmittingPatches' document for further discussion. + A boolean value which lets you enable the `-s/--signoff` option of + format-patch by default. *Note:* Adding the Signed-off-by: line to a + patch should be a conscious act and means that you certify you have + the rights to submit this work under the same open source license. + Please see the 'SubmittingPatches' document for further discussion. format.coverLetter:: A boolean that controls whether to generate a cover-letter when @@ -1225,7 +1225,7 @@ gitcvs.dbname:: gitcvs.dbdriver:: Used Perl DBI driver. You can specify any available driver - for this here, but it might not work. git-cvsserver is tested + for this here, but it might not work. git-cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Experimental feature. May not contain double colons (`:`). Default: 'SQLite'. diff --git a/t/Makefile b/t/Makefile index 1923cc104b..44ca7d32dc 100644 --- a/t/Makefile +++ b/t/Makefile @@ -83,42 +83,4 @@ valgrind: perf: $(MAKE) -C perf/ all -# Smoke testing targets --include ../GIT-VERSION-FILE -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo unknown') -uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo unknown') - -test-results: - mkdir -p test-results - -test-results/git-smoke.tar.gz: test-results - '$(PERL_PATH_SQ)' ./harness \ - --archive="test-results/git-smoke.tar.gz" \ - $(T) - -smoke: test-results/git-smoke.tar.gz - -SMOKE_UPLOAD_FLAGS = -ifdef SMOKE_USERNAME - SMOKE_UPLOAD_FLAGS += -F username="$(SMOKE_USERNAME)" -F password="$(SMOKE_PASSWORD)" -endif -ifdef SMOKE_COMMENT - SMOKE_UPLOAD_FLAGS += -F comments="$(SMOKE_COMMENT)" -endif -ifdef SMOKE_TAGS - SMOKE_UPLOAD_FLAGS += -F tags="$(SMOKE_TAGS)" -endif - -smoke_report: smoke - curl \ - -H "Expect: " \ - -F project=Git \ - -F architecture="$(uname_M)" \ - -F platform="$(uname_S)" \ - -F revision="$(GIT_VERSION)" \ - -F report_file=@test-results/git-smoke.tar.gz \ - $(SMOKE_UPLOAD_FLAGS) \ - http://smoke.git.nix.is/app/projects/process_add_report/1 \ - | grep -v ^Redirecting - .PHONY: pre-clean $(T) aggregate-results clean valgrind perf |