git-diff -B output fix.

diff --git a/checkout-index.c b/checkout-index.c
index 29279555086ce36cdf598e390898a46888543846..dfb1c4441550c6de596a1245161cfbca34ada10c 100644 (file)
--- 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;
@@ -212,7 +206,7 @@ int main(int argc, char **argv)
                        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;