Merge branch 'mh/for-each-string-list-item-empty-fix'

diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 4789106fc093391f1c3e67d0fe46c8ece47fde34..d7d344de73e6f85fed1e8460bce246a894eab6da 100644 (file)
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -61,6 +61,12 @@
  */
 #define REF_DELETED_LOOSE 0x200
 
+/*
+ * Return the length of time to retry acquiring a loose reference lock
+ * before giving up, in milliseconds:
+ */
+long get_files_ref_lock_timeout_ms(void);
+
 /*
  * Return true iff refname is minimally safe. "Safe" here means that
  * deleting a loose reference by this name will not do any damage, for
@@ -236,6 +242,7 @@ struct ref_transaction {
        size_t alloc;
        size_t nr;
        enum ref_transaction_state state;
+       void *backend_data;
 };
 
 /*