From 670f99097939a08510c2c909cd38f8083800861a Mon Sep 17 00:00:00 2001
From: Lars Hjemli <larsh@slackbox.hjemli.net>
Date: Sun, 06 Sep 2009 17:33:27 +0000
Subject: Merge branch 'stable'

---
(limited to 'ui-plain.c')

diff --git a/ui-plain.c b/ui-plain.c
index 27c6dae..a4ce077 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -60,7 +60,8 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 	if (S_ISDIR(mode))
 		return READ_TREE_RECURSIVE;
 
-	if (S_ISREG(mode))
+	if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
+	    !strcmp(pathname, match_path + baselen))
 		print_object(sha1, pathname);
 
 	return 0;
--
cgit v0.9.0.2