diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-04 11:23:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-04 11:23:45 -0800 |
| commit | f2665ec9fa42b75d92d0301cff85362836c5729a (patch) | |
| tree | 5f72e3c95b320fa6eb3d9afcec642e3c7dcd1b9a | |
| parent | 081f84ee9edb1775e5a5495375a93b3bc6727742 (diff) | |
| parent | 9d9f5e72dc5959750498acc81b3e2c8ca76ad499 (diff) | |
| download | git-f2665ec9fa42b75d92d0301cff85362836c5729a.tar.gz | |
Merge branch 'maint'
* maint:
gitweb: skip logo in atom feed when there is none
t9001: Fix test prerequisites
| -rwxr-xr-x | gitweb/gitweb.perl | 2 | ||||
| -rwxr-xr-x | t/t9001-send-email.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 47796180d2..c65af1a00a 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -7169,7 +7169,7 @@ XML if (defined $favicon) { print "<icon>" . esc_url($favicon) . "</icon>\n"; } - if (defined $logo_url) { + if (defined $logo) { # not twice as wide as tall: 72 x 27 pixels print "<logo>" . esc_url($logo) . "</logo>\n"; } diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 1dc4a9228e..3271426f79 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1135,7 +1135,7 @@ test_expect_success $PREREQ '--8bit-encoding also treats subject' ' # Note that the patches in this test are deliberately out of order; we # want to make sure it works even if the cover-letter is not in the # first mail. -test_expect_success 'refusing to send cover letter template' ' +test_expect_success $PREREQ 'refusing to send cover letter template' ' clean_fake_sendmail && rm -fr outdir && git format-patch --cover-letter -2 -o outdir && @@ -1151,7 +1151,7 @@ test_expect_success 'refusing to send cover letter template' ' test -z "$(ls msgtxt*)" ' -test_expect_success '--force sends cover letter template anyway' ' +test_expect_success $PREREQ '--force sends cover letter template anyway' ' clean_fake_sendmail && rm -fr outdir && git format-patch --cover-letter -2 -o outdir && |