From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Wed, 5 Mar 2014 17:26:25 +0000 (+0100)
Subject: cache_tree_find(): remove redundant checks
X-Git-Tag: v2.0.0-rc0~91^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/72c378d8a618b9a57e4edf12700c51b0af86f124?ds=sidebyside;hp=--cc

cache_tree_find(): remove redundant checks

slash is initialized to a value that cannot be NULL.  So remove the
guards against slash == NULL later in the loop.

Suggested-by: David Kastrup <dak@gnu.org>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

72c378d8a618b9a57e4edf12700c51b0af86f124
diff --git a/cache-tree.c b/cache-tree.c
index 0bbec43216..4d439bd915 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -564,10 +564,9 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat
 		if (!sub)
 			return NULL;
 		it = sub->cache_tree;
-		if (slash)
-			while (*slash && *slash == '/')
-				slash++;
-		if (!slash || !*slash)
+		while (*slash && *slash == '/')
+			slash++;
+		if (!*slash)
 			return it; /* prefix ended with slashes */
 		path = slash;
 	}