From 57da20426417cd0834e7fc442096d1c18924228a Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Wed, 29 Dec 2010 21:02:31 +0000 Subject: [PATCH 1/2] t9001: Fix test prerequisites Add in missing Perl prerequisites for new tests of send-email. Signed-off-by: Robin H. Johnson Signed-off-by: Junio C Hamano --- t/t9001-send-email.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index a298eb04373..f1047d2ef3e 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1035,7 +1035,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 && @@ -1051,7 +1051,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 && From 9d9f5e72dc5959750498acc81b3e2c8ca76ad499 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 3 Sep 2010 19:44:39 -0500 Subject: [PATCH 2/2] gitweb: skip logo in atom feed when there is none With v1.5.0-rc0~169 (gitweb: Fix Atom feed : it is $logo, not $logo_url, 2006-12-04), the logo URI to be written to Atom feeds was corrected but the case of no logo forgotten. Acked-by: Eric Wong Signed-off-by: Jonathan Nieder Acked-by: Jakub Narebski Signed-off-by: Junio C Hamano --- gitweb/gitweb.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 42cc1da7ff8..59b2e08b980 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -6870,7 +6870,7 @@ XML if (defined $favicon) { print "" . esc_url($favicon) . "\n"; } - if (defined $logo_url) { + if (defined $logo) { # not twice as wide as tall: 72 x 27 pixels print "" . esc_url($logo) . "\n"; }