Merge branch 'pb/maint-gitweb-blob-lineno' into maint

gitster · gitster · commit 3ad12436a0d2 · 2009-11-15T23:07:38.000-08:00
* pb/maint-gitweb-blob-lineno:
  gitweb: Fix blob linenr links in pathinfo mode
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
@@ -5064,7 +5064,8 @@ sub git_blob {
 			chomp $line;
 			$nr++;
 			$line = untabify($line);
-			printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n",
+			printf "<div class=\"pre\"><a id=\"l%i\" href=\"" . href(-replay => 1)
+				. "#l%i\" class=\"linenr\">%4i</a> %s</div>\n",
 			       $nr, $nr, $nr, esc_html($line, -nbsp=>1);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -5064,7 +5064,8 @@ sub git_blob {`
`5064`	`5064`	`chomp $line;`
`5065`	`5065`	`$nr++;`
`5066`	`5066`	`$line = untabify($line);`
`5067`		`- printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n",`
	`5067`	`+ printf "<div class=\"pre\"><a id=\"l%i\" href=\"" . href(-replay => 1)`
	`5068`	`+ . "#l%i\" class=\"linenr\">%4i</a> %s</div>\n",`
`5068`	`5069`	`$nr, $nr, $nr, esc_html($line, -nbsp=>1);`
`5069`	`5070`	`}`
`5070`	`5071`	`}`