X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-checkout-index.c;h=6b55f931cbd8b79a01057b55eb41a043a4db5e3b;hb=1c2a4f5addce479c619057c6cdc841802139982f;hp=29ea6fdc6232c1071d88524fa5c11d5ba1882dee;hpb=e414156ab6e7869b29622ee3439e3c91361f5b0e;p=git.git

diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c
index 29ea6fdc6..6b55f931c 100644
--- a/builtin-checkout-index.c
+++ b/builtin-checkout-index.c
@@ -122,7 +122,7 @@ static int checkout_file(const char *name, int prefix_length)
 	return -1;
 }
 
-static int checkout_all(const char *prefix, int prefix_length)
+static void checkout_all(const char *prefix, int prefix_length)
 {
 	int i, errs = 0;
 	struct cache_entry* last_ce = NULL;
@@ -153,7 +153,6 @@ static int checkout_all(const char *prefix, int prefix_length)
 		 * exit with the same code as die().
 		 */
 		exit(128);
-	return 0;
 }
 
 static const char checkout_cache_usage[] =
@@ -204,7 +203,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 			state.refresh_cache = 1;
 			if (newfd < 0)
 				newfd = hold_lock_file_for_update
-					(&lock_file, get_index_file());
+					(&lock_file, get_index_file(), 1);
 			if (newfd < 0)
 				die("cannot open index.lock file.");
 			continue;