{"thread":{"id":"19351","subject":"Re: [PATCH 1/3] '--missing' option for mktree: updated usage message and man page","startedAt":"2009-05-14T19:46:03Z","lastAt":"2009-05-14T19:46:03Z","messageCount":1,"participants":["Josh Micich"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"113954","messageId":"a644352c0905141246v7948de25o2b22f3c6f1bcff41@mail.gmail.com","threadId":"19351","inReplyTo":null,"subject":"Re: [PATCH 1/3] '--missing' option for mktree: updated usage message and man page","fromName":"Josh Micich","fromEmail":"josh.micich@gmail.com","sentAt":"2009-05-14T19:46:03Z","receivedAt":"2009-05-14T19:46:03Z","isPatch":true,"sender":{"key":"josh.micich@gmail.com","avatar":null},"body":"Updated usage message in builtin-mktree.c to include '--missing'.\nUpdated man page to explain new '--missing' option. Also clarified\nsorting behaviour.\n\nSigned-off-by: Josh Micich <josh.micich@gmail.com>\n---\n Documentation/git-mktree.txt |   13 ++++++++++---\n builtin-mktree.c             |    2 +-\n 2 files changed, 11 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt\nindex af19f06..7336f48 100644\n--- a/Documentation/git-mktree.txt\n+++ b/Documentation/git-mktree.txt\n@@ -8,12 +8,13 @@ git-mktree - Build a tree-object from ls-tree formatted text\n\n SYNOPSIS\n --------\n-'git mktree' [-z]\n+'git mktree' [-z] [--missing]\n\n DESCRIPTION\n -----------\n-Reads standard input in non-recursive `ls-tree` output format,\n-and creates a tree object.  The object name of the tree object\n+Reads standard input in non-recursive `ls-tree` output format, and creates\n+a tree object.  The order of the tree entries is normalised by mktree so\n+pre-sorting the input is not required.  The object name of the tree object\n built is written to the standard output.\n\n OPTIONS\n@@ -21,6 +22,12 @@ OPTIONS\n -z::\n \tRead the NUL-terminated `ls-tree -z` output instead.\n\n+--missing::\n+\tAllow missing objects.  The default behaviour (without this option)\n+\tis to verify that each tree entry's sha1 identifies an existing\n+\tobject.  This option has no effect on the treatment of gitlink entries\n+\t(aka \"submodules\") which are always allowed to be missing.\n+\n Author\n ------\n Written by Junio C Hamano <gitster@pobox.com>\ndiff --git a/builtin-mktree.c b/builtin-mktree.c\nindex e1c9a27..5ff0475 100644\n--- a/builtin-mktree.c\n+++ b/builtin-mktree.c\n@@ -63,7 +63,7 @@ static void write_tree(unsigned char *sha1)\n }\n\n static const char *mktree_usage[] = {\n-\t\"git mktree [-z]\",\n+\t\"git mktree [-z] [--missing]\",\n \tNULL\n };\n\n-- \n1.6.3.1.181.gfc9b3\n"}]}