From: Jakub Narebski <jnareb@gmail.com>
Date: Thu, 21 Sep 2006 16:09:12 +0000 (+0200)
Subject: gitweb: Make git_get_hash_by_path check type if provided
X-Git-Tag: v1.4.3-rc1~63
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1d782b03b078c1a525cbb5728f6dc5eb06f06924;p=git.git

gitweb: Make git_get_hash_by_path check type if provided

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index fb8d37eb7..d3757f49b 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -718,6 +718,7 @@ sub git_get_project_config {
 sub git_get_hash_by_path {
 	my $base = shift;
 	my $path = shift || return undef;
+	my $type = shift;
 
 	my $tree = $base;
 
@@ -728,6 +729,10 @@ sub git_get_hash_by_path {
 
 	#'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa	panic.c'
 	$line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
+	if (defined $type && $type ne $2) {
+		# type doesn't match
+		return undef;
+	}
 	return $3;
 }