From: Jakub Narebski <jnareb@gmail.com>
Date: Sun, 27 Aug 2006 21:45:26 +0000 (+0200)
Subject: gitweb: Remove git_to_hash function
X-Git-Tag: v1.4.3-rc1~168^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0aea33762b1262d11fb43eda9f3fc152b5622cca;p=git.git

gitweb: Remove git_to_hash function

Remove git_to_hash function, which was to translate symbolic reference
to hash, and it's use in git_blobdiff.  We don't try so hard to guess
filename if it was not 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 9aa7e4df4..8d28207b1 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -625,26 +625,6 @@ sub git_get_hash_by_path {
 	return $3;
 }
 
-# converts symbolic name to hash
-sub git_to_hash {
-	my @params = @_;
-	return undef unless @params;
-
-	open my $fd, "-|", $GIT, "rev-parse", @params
-		or return undef;
-	my @hashes = map { chomp; $_ } <$fd>;
-	close $fd;
-
-	if (wantarray) {
-		return @hashes;
-	} elsif (scalar(@hashes) == 1) {
-		# single hash
-		return $hashes[0];
-	} else {
-		return \@hashes;
-	}
-}
-
 ## ......................................................................
 ## git utility functions, directly accessing git repository
 
@@ -2733,6 +2713,9 @@ sub git_blobdiff {
 			if ($hash !~ /[0-9a-fA-F]{40}/) {
 				$hash = git_to_hash($hash);
 			}
+		} elsif (defined $hash &&
+		         $hash =~ /[0-9a-fA-F]{40}/) {
+			# try to find filename from $hash
 
 			# read filtered raw output
 			open $fd, "-|", $GIT, "diff-tree", '-r', '-M', '-C', $hash_parent_base, $hash_base