mktree --missing: updated usage message and man page

Update usage message in builtin-mktree.c to include '--missing'.  Do the
same to man page and clarify that the input does not have to be sorted.

Signed-off-by: Josh Micich <josh.micich@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
index af19f06ed738bdecc7ab9a72a5c9a216b816f4c2..7336f48bd1e90dabf8e735dc27023b65309e1aef 100644 (file)
--- 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
 --------
 
 SYNOPSIS
 --------

-'git mktree' [-z]
+'git mktree' [-z] [--missing]

 
 DESCRIPTION
 -----------
 
 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
 built is written to the standard output.
 
 OPTIONS


@@ -21,6 +22,12 @@ OPTIONS
 -z::
        Read the NUL-terminated `ls-tree -z` output instead.
 
 -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>
 Author
 ------
 Written by Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-mktree.c b/builtin-mktree.c
index e1c9a2701adf4e692385336a764003b28134067d..5ff04753b756a72c521d6a95321417812e90e865 100644 (file)
--- a/builtin-mktree.c
+++ b/builtin-mktree.c
@@ -63,7 +63,7 @@ static void write_tree(unsigned char *sha1)
 }
 
 static const char *mktree_usage[] = {
 }
 
 static const char *mktree_usage[] = {

-       "git mktree [-z]",
+       "git mktree [-z] [--missing]",

        NULL
 };
 
        NULL
 };