Add an option to quiet git-init.

git-init lacks an option to suppress non-error and non-warning output -
this patch adds one.

Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt
index ab0201aec2131d48b535cf6307fc446dffd89a9b..d4e01cb325150b72a30bde67ba55461d8062fb83 100644 (file)
--- a/Documentation/git-init-db.txt
+++ b/Documentation/git-init-db.txt
@@ -8,7 +8,7 @@ git-init-db - Creates an empty git repository
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-init-db' [--template=<template_directory>] [--shared[=<permissions>]]
+'git-init-db' [-q | --quiet] [--template=<template_directory>] [--shared[=<permissions>]]

 
 
 DESCRIPTION
 
 
 DESCRIPTION

diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 413ed65143d90b32a9b77301953f45bc26465e7d..07484a4fd065b639bbf33832cbf642eb8399757e 100644 (file)
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -8,7 +8,7 @@ git-init - Create an empty git repository or reinitialize an existing one
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-init' [--template=<template_directory>] [--shared[=<permissions>]]
+'git-init' [-q | --quiet] [--template=<template_directory>] [--shared[=<permissions>]]

 
 
 OPTIONS
 
 
 OPTIONS


@@ -16,6 +16,10 @@ OPTIONS
 
 --
 
 
 --
 

+-q, \--quiet::
+
+Only print error and warning messages, all other output will be suppressed.
+

 --template=<template_directory>::
 
 Provide the directory from which templates will be used.  The default template
 --template=<template_directory>::
 
 Provide the directory from which templates will be used.  The default template

diff --git a/builtin-init-db.c b/builtin-init-db.c
index 976f47b3233cf0aba34e104bb4524aace40dccba..d429ceda369ed4810ee42ae9aea6da105b795cc7 100644 (file)
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -266,7 +266,7 @@ static int create_default_files(const char *git_dir, const char *template_path)
 }
 
 static const char init_db_usage[] =
 }
 
 static const char init_db_usage[] =

-"git-init [--template=<template-directory>] [--shared]";
+"git-init [-q | --quiet] [--template=<template-directory>] [--shared]";

 
 /*
  * If you want to, you can share the DB area with any number of branches.
 
 /*
  * If you want to, you can share the DB area with any number of branches.


@@ -281,6 +281,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
        const char *template_dir = NULL;
        char *path;
        int len, i, reinit;
        const char *template_dir = NULL;
        char *path;
        int len, i, reinit;

+       int quiet = 0;

 
        for (i = 1; i < argc; i++, argv++) {
                const char *arg = argv[1];
 
        for (i = 1; i < argc; i++, argv++) {
                const char *arg = argv[1];


@@ -290,6 +291,8 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
                        shared_repository = PERM_GROUP;
                else if (!prefixcmp(arg, "--shared="))
                        shared_repository = git_config_perm("arg", arg+9);
                        shared_repository = PERM_GROUP;
                else if (!prefixcmp(arg, "--shared="))
                        shared_repository = git_config_perm("arg", arg+9);

+               else if (!strcmp(arg, "-q") || !strcmp(arg, "--quiet"))
+                       quiet = 1;

                else
                        usage(init_db_usage);
        }
                else
                        usage(init_db_usage);
        }


@@ -336,10 +339,11 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
                git_config_set("receive.denyNonFastforwards", "true");
        }
 
                git_config_set("receive.denyNonFastforwards", "true");
        }
 

-       printf("%s%s Git repository in %s/\n",
-               reinit ? "Reinitialized existing" : "Initialized empty",
-               shared_repository ? " shared" : "",
-               git_dir);
+       if (!quiet)
+               printf("%s%s Git repository in %s/\n",
+                      reinit ? "Reinitialized existing" : "Initialized empty",
+                      shared_repository ? " shared" : "",
+                      git_dir);

 
        return 0;
 }
 
        return 0;
 }