X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=blame.c;h=9c97aeca451f641ff319fc4bee70a97488e619cd;hb=cb85bfe5dfd7504dfee43ae49a76edb92e8d8eb0;hp=8af4b543000588f352d49e671888b815b5dce55f;hpb=88a8b7955666ed8fa5924fadbb3bb58984eaa6af;p=git.git

diff --git a/blame.c b/blame.c
index 8af4b543..9c97aeca 100644
--- a/blame.c
+++ b/blame.c
@@ -180,11 +180,13 @@ static int get_blob_sha1_internal(unsigned char *sha1, const char *base,
 				  unsigned mode, int stage);
 
 static unsigned char blob_sha1[20];
+static const char* blame_file;
 static int get_blob_sha1(struct tree *t, const char *pathname,
 			 unsigned char *sha1)
 {
 	int i;
 	const char *pathspec[2];
+	blame_file = pathname;
 	pathspec[0] = pathname;
 	pathspec[1] = NULL;
 	memset(blob_sha1, 0, sizeof(blob_sha1));
@@ -209,6 +211,10 @@ static int get_blob_sha1_internal(unsigned char *sha1, const char *base,
 	if (S_ISDIR(mode))
 		return READ_TREE_RECURSIVE;
 
+	if (strncmp(blame_file, base, baselen) ||
+	    strcmp(blame_file + baselen, pathname))
+		return -1;
+
 	memcpy(blob_sha1, sha1, 20);
 	return -1;
 }