Merge branch 'jc/index-output'

* jc/index-output:
  git-read-tree --index-output=<file>
  _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.

Conflicts:

	builtin-apply.c

1 files changed, 22 insertions, 0 deletions

diff --git a/lockfile.c b/lockfile.c
index 4824f4dc02..bed6b21daf 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -4,6 +4,7 @@
 #include "cache.h"
 
 static struct lock_file *lock_file_list;
+static const char *alternate_index_output;
 
 static void remove_lock_file(void)
 {
@@ -65,6 +66,27 @@ int commit_lock_file(struct lock_file *lk)
 	return i;
 }
 
+int hold_locked_index(struct lock_file *lk, int die_on_error)
+{
+	return hold_lock_file_for_update(lk, get_index_file(), die_on_error);
+}
+
+void set_alternate_index_output(const char *name)
+{
+	alternate_index_output = name;
+}
+
+int commit_locked_index(struct lock_file *lk)
+{
+	if (alternate_index_output) {
+		int result = rename(lk->filename, alternate_index_output);
+		lk->filename[0] = 0;
+		return result;
+	}
+	else
+		return commit_lock_file(lk);
+}
+
 void rollback_lock_file(struct lock_file *lk)
 {
 	if (lk->filename[0])