reset/checkout/read-tree: unify config callback for submodule recursion

diff --git a/builtin/grep.c b/builtin/grep.c
index 3c721b75a51b57be4d54380f80458693f33bdc51..b1095362fbf9a4726367b96e0f34d38faf27d9bd 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -73,14 +73,14 @@ static pthread_mutex_t grep_mutex;
 
 static inline void grep_lock(void)
 {
-       if (num_threads)
-               pthread_mutex_lock(&grep_mutex);
+       assert(num_threads);
+       pthread_mutex_lock(&grep_mutex);
 }
 
 static inline void grep_unlock(void)
 {
-       if (num_threads)
-               pthread_mutex_unlock(&grep_mutex);
+       assert(num_threads);
+       pthread_mutex_unlock(&grep_mutex);
 }
 
 /* Signalled when a new work_item is added to todo. */