Re: [PATCH 1/3] '--missing' option for mktree: updated usage message and man page
From: Josh Micich <hidden>
Date: 2016-06-15 22:46:46
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Updated usage message in builtin-mktree.c to include '--missing'. Updated man page to explain new '--missing' option. Also clarified sorting behaviour. Signed-off-by: Josh Micich <redacted> --- Documentation/git-mktree.txt | 13 ++++++++++--- builtin-mktree.c | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
index af19f06..7336f48 100644
--- a/Documentation/git-mktree.txt
+++ b/Documentation/git-mktree.txt@@ -8,12 +8,13 @@ git-mktree - Build a tree-object from ls-tree formatted text SYNOPSIS -------- -'git mktree' [-z] +'git mktree' [-z] [--missing] DESCRIPTION ----------- -Reads standard input in non-recursive `ls-tree` output format, -and creates a tree object. The object name of the tree object +Reads standard input in non-recursive `ls-tree` output format, and creates +a tree object. The order of the tree entries is normalised by mktree so +pre-sorting the input is not required. The object name of the tree object built is written to the standard output. OPTIONS
@@ -21,6 +22,12 @@ OPTIONS -z:: Read the NUL-terminated `ls-tree -z` output instead. +--missing:: + Allow missing objects. The default behaviour (without this option) + is to verify that each tree entry's sha1 identifies an existing + object. This option has no effect on the treatment of gitlink entries + (aka "submodules") which are always allowed to be missing. + Author ------ Written by Junio C Hamano <gitster@pobox.com>
diff --git a/builtin-mktree.c b/builtin-mktree.c
index e1c9a27..5ff0475 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]", + "git mktree [-z] [--missing]", NULL };
--
1.6.3.1.181.gfc9b3