X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-read-tree.c;h=316fb0f8dae022b35a89b71c94a22331a77a500a;hb=952c8c56380734d45bddf369fe478895672c5a3a;hp=87048f82ee22cc3f2310bb7329328c31127280e0;hpb=30ca07a249744e57163c02250fca420cea364299;p=git.git

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 87048f82e..316fb0f8d 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -84,7 +84,7 @@ static void prime_cache_tree(void)
 
 }
 
-static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] <sha1> [<sha2> [<sha3>]])";
+static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <sha1> [<sha2> [<sha3>]])";
 
 static struct lock_file lock_file;
 
@@ -128,6 +128,11 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 			continue;
 		}
 
+		if (!prefixcmp(arg, "--index-output=")) {
+			set_alternate_index_output(arg + 15);
+			continue;
+		}
+
 		/* "--prefix=<subdirectory>/" means keep the current index
 		 *  entries and put the entries from the tree under the
 		 * given subdirectory.
@@ -228,6 +233,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 		if (0 <= pos)
 			die("file '%.*s' already exists.",
 					pfxlen-1, opts.prefix);
+		opts.pos = -1 - pos;
 	}
 
 	if (opts.merge) {