diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-31 23:27:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-03 23:44:32 -0700 |
| commit | 5e7f56ac33f7a5583f9fa4e0b6088709fea7a6f8 (patch) | |
| tree | a0a6896849d34635f947fabc82d8400c473f28b4 /builtin-read-tree.c | |
| parent | 30ca07a249744e57163c02250fca420cea364299 (diff) | |
| download | git-5e7f56ac33f7a5583f9fa4e0b6088709fea7a6f8.tar.gz | |
git-read-tree --index-output=<file>
This corrects the interface mistake of the previous one, and
gives a command line parameter to the only plumbing command that
currently needs it: "git-read-tree".
We can add the calls to set_alternate_index_output() to other
plumbing commands that update the index if/when needed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-read-tree.c')
| -rw-r--r-- | builtin-read-tree.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 87048f82ee..213bd93c7f 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. |