refactor git_getpass into generic prompt function

diff --git a/builtin/grep.c b/builtin/grep.c
index 3ddfae4e79b5092a211608f25b6ded9b522d9f99..3d7329d78c6e3ec31ed8ce03b8928c9ed24afb9e 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -373,13 +373,9 @@ static void *lock_and_read_sha1_file(const unsigned char *sha1, enum object_type
 {
        void *data;
 
-       if (use_threads) {
-               read_sha1_lock();
-               data = read_sha1_file(sha1, type, size);
-               read_sha1_unlock();
-       } else {
-               data = read_sha1_file(sha1, type, size);
-       }
+       read_sha1_lock();
+       data = read_sha1_file(sha1, type, size);
+       read_sha1_unlock();
        return data;
 }