X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=checkout-index.c;h=61152f34b7fc00e745a2f7524c4da5b5a1a780a2;hb=06d30f4f3eea71bce4cf48db3ea384976b3983b7;hp=ea40bc29bed17fbd6e3326edaa6fb3c38b742de6;hpb=0a8f4f0020cb35095005852c0797f0b90e9ebb74;p=git.git

diff --git a/checkout-index.c b/checkout-index.c
index ea40bc29b..61152f34b 100644
--- a/checkout-index.c
+++ b/checkout-index.c
@@ -49,14 +49,7 @@ static int checkout_stage; /* default to checkout stage0 */
 static int to_tempfile;
 static char topath[4][MAXPATHLEN+1];
 
-static struct checkout state = {
-	.base_dir = "",
-	.base_dir_len = 0,
-	.force = 0,
-	.quiet = 0,
-	.not_new = 0,
-	.refresh_cache = 0,
-};
+static struct checkout state;
 
 static void write_tempfile_record (const char *name)
 {
@@ -177,6 +170,7 @@ int main(int argc, char **argv)
 	int all = 0;
 	int read_from_stdin = 0;
 
+	state.base_dir = "";
 	prefix = setup_git_directory();
 	git_config(git_default_config);
 	prefix_length = prefix ? strlen(prefix) : 0;
@@ -311,7 +305,7 @@ int main(int argc, char **argv)
 
 	if (0 <= newfd &&
 	    (write_cache(newfd, active_cache, active_nr) ||
-	     commit_lock_file(&lock_file)))
+	     close(newfd) || commit_lock_file(&lock_file)))
 		die("Unable to write new index file");
 	return 0;
 }