Merge branch 'maint'

gitster · gitster · commit f2665ec9fa42 · 2011-01-04T11:23:45.000-08:00
* maint:
  gitweb: skip logo in atom feed when there is none
  t9001: Fix test prerequisites
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -7169,7 +7169,7 @@ sub git_feed {
 		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
@@ -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 &&

Original file line number	Diff line number	Diff line change
`@@ -7169,7 +7169,7 @@ sub git_feed {`
`7169`	`7169`	`if (defined $favicon) {`
`7170`	`7170`	`print "<icon>" . esc_url($favicon) . "</icon>\n";`
`7171`	`7171`	`}`
`7172`		`- if (defined $logo_url) {`
	`7172`	`+ if (defined $logo) {`
`7173`	`7173`	`# not twice as wide as tall: 72 x 27 pixels`
`7174`	`7174`	`print "<logo>" . esc_url($logo) . "</logo>\n";`
`7175`	`7175`	`}`