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

gitster · gitster · commit a12e3cf3a2db · 2009-11-10T12:35:31.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
@@ -5127,7 +5127,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
`@@ -5127,7 +5127,8 @@ sub git_blob {`
`5127`	`5127`	`chomp $line;`
`5128`	`5128`	`$nr++;`
`5129`	`5129`	`$line = untabify($line);`
`5130`		`- printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n",`
	`5130`	`+ printf "<div class=\"pre\"><a id=\"l%i\" href=\"" . href(-replay => 1)`
	`5131`	`+ . "#l%i\" class=\"linenr\">%4i</a> %s</div>\n",`
`5131`	`5132`	`$nr, $nr, $nr, esc_html($line, -nbsp=>1);`
`5132`	`5133`	`}`
`5133`	`5134`	`}`