[PATCH 2/3] added --batch option to mktree
This option enables creation of many tree objects with a single process
Signed-off-by: Josh Micich <josh.micich@gmail.com>
---
Documentation/git-mktree.txt | 7 ++++++-
builtin-mktree.c | 36 +++++++++++++++++++++++++++++-------
2 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
index 0461062..3d2237a 100644
--- a/Documentation/git-mktree.txt
+++ b/Documentation/git-mktree.txt
@@ -8,7 +8,7 @@ git-mktree - Build a tree-object from ls-tree formatted text
SYNOPSIS
--------
-'git mktree' [-z] [--missing]
+'git mktree' [-z] [--missing] [--batch]
DESCRIPTION
-----------
@@ -25,6 +25,11 @@ OPTIONS
Allow missing objects. The default behaviour (without this option)
is to verify that each tree entry's sha1 identifies an existing
object.
+--batch::
+ Allow building of more than one tree object before exiting. Each
+ tree is separated by as single blank line. The final new-line is
+ optional. Note - if the '-z' option is used, lines are terminated
+ with NUL.
Author
------
diff --git a/builtin-mktree.c b/builtin-mktree.c
index db647ce..a56c917 100644
--- a/builtin-mktree.c
+++ b/builtin-mktree.c
@@ -63,7 +63,7 @@ static void write_tree(unsigned char *sha1)
}
static const char *mktree_usage[] = {
- "git mktree [-z] [--missing]",
+ "git mktree [-z] [--missing] [--batch]",
NULL
};
@@ -125,20 +125,42 @@ int cmd_mktree(int ac, const char **av, const char
*prefix)
unsigned char sha1[20];
int line_termination = '\n';
int allow_missing = 0;
+ int is_batch_mode = 0;
+
const struct option option[] = {
OPT_SET_INT('z', NULL, &line_termination, "input is NUL
terminated", '\0'),
OPT_SET_INT( 0 , "missing", &allow_missing, "allow missing
objects", 1),
+ OPT_SET_INT( 0 , "batch", &is_batch_mode, "interactively create
more than one tree", 1),
OPT_END()
};
ac = parse_options(ac, av, option, mktree_usage, 0);
- while (strbuf_getline(&sb, stdin, line_termination) != EOF)
- mktree_line(sb.buf, sb.len, line_termination, allow_missing);
-
+ int got_eof = 0;
+ while (!got_eof) {
+ while (1) {
+ if (strbuf_getline(&sb, stdin, line_termination) ==
EOF) {
+ got_eof = 1;
+ break;
+ }
+ if (sb.buf[0] == '\0') {
+ // empty lines denote tree boundaries in batch
mode
+ if (is_batch_mode) {
+ break;
+ }
+ die("input format error: (blank line only valid
in batch mode)");
+ }
+ mktree_line(sb.buf, sb.len, line_termination,
allow_missing);
+ }
+ if (is_batch_mode && got_eof && used < 1) {
+ // allow input to finish with a new-line (or not)
+ } else {
+ write_tree(sha1);
+ puts(sha1_to_hex(sha1));
+ fflush(stdout);
+ }
+ used=0; // reset tree entry buffer for re-use in batch mode
+ }
strbuf_release(&sb);
-
- write_tree(sha1);
- puts(sha1_to_hex(sha1));
exit(0);
}
--
1.6.3.165.g2cce5.dirty