Merge branch 'jk/maint-ls-files-other' into maint

diff --git a/cache.h b/cache.h
index 76730cee61441ce694c48addf02e935237addc71..74339edaaa2bc5fbf3e920d66a8bca9cc5b785d3 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -413,6 +413,8 @@ struct lock_file {
        char on_list;
        char filename[PATH_MAX];
 };
+#define LOCK_DIE_ON_ERROR 1
+#define LOCK_NODEREF 2
 extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
 extern int hold_lock_file_for_append(struct lock_file *, const char *path, int);
 extern int commit_lock_file(struct lock_file *);