diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:56:52 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:56:52 -0700 |
commit | 75c3a5ccdf114b5485e4828db1923bf4a35b19e2 (patch) | |
tree | e919c376fa68f0ce8b46918b499d8ed8516c048a /write-tree.c | |
parent | 8c278abcbe35b23e9f93e99daf2144336fad1849 (diff) | |
parent | d6970e42a1763b549ccf93558de7f54a78819d7a (diff) | |
download | git-75c3a5ccdf114b5485e4828db1923bf4a35b19e2.tar.gz |
Merge branch 'jc/rw-prefix'
* jc/rw-prefix:
read-tree: reorganize bind_merge code.
write-tree: --prefix=<path>
read-tree: --prefix=<path>/ option.
Diffstat (limited to 'write-tree.c')
-rw-r--r-- | write-tree.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/write-tree.c b/write-tree.c index d6a605893d..bd07da6183 100644 --- a/write-tree.c +++ b/write-tree.c @@ -8,8 +8,10 @@ #include "cache-tree.h" static int missing_ok = 0; +static char *prefix = NULL; -static const char write_tree_usage[] = "git-write-tree [--missing-ok]"; +static const char write_tree_usage[] = +"git-write-tree [--missing-ok] [--prefix=<prefix>/]"; static struct lock_file lock_file; @@ -21,13 +23,18 @@ int main(int argc, char **argv) newfd = hold_lock_file_for_update(&lock_file, get_index_file()); entries = read_cache(); - if (argc == 2) { - if (!strcmp(argv[1], "--missing-ok")) + + while (1 < argc) { + char *arg = argv[1]; + if (!strcmp(arg, "--missing-ok")) missing_ok = 1; + else if (!strncmp(arg, "--prefix=", 9)) + prefix = arg + 9; else die(write_tree_usage); + argc--; argv++; } - + if (argc > 2) die("too many options"); @@ -54,6 +61,12 @@ int main(int argc, char **argv) * performance penalty and not a big deal. */ } - printf("%s\n", sha1_to_hex(active_cache_tree->sha1)); + if (prefix) { + struct cache_tree *subtree = + cache_tree_find(active_cache_tree, prefix); + printf("%s\n", sha1_to_hex(subtree->sha1)); + } + else + printf("%s\n", sha1_to_hex(active_cache_tree->sha1)); return 0; } |