Merge branch 'master' into next

diff --git a/refs.h b/refs.h
index 2c854de3fe14f8579c0983a70337b3076db17185..6c946eabcfcf4d29dc0157415fb8e48cd278e2c8 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -7,6 +7,7 @@ struct ref_lock {
        char *log_file;
        unsigned char old_sha1[20];
        int lock_fd;
+       int force_write;
 };
 
 /*