This takes auto, never or always to enable column output for
porcelain commands.
Signed-off-by: Nguyán ThÃi Ngác Duy <pclouds@xxxxxxxxx>
---
Documentation/config.txt | 8 ++++++++
cache.h | 1 +
config.c | 16 ++++++++++++++++
environment.c | 1 +
4 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c5e1835..6d7151b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -567,6 +567,14 @@ core.sparseCheckout::
Enable "sparse checkout" feature. See section "Sparse checkout" in
linkgit:git-read-tree[1] for more information.
+core.column::
+ Specify whether a command should output in columns. Only commands
+ that support `--column` will be affected by this. This variable can
+ take either `never` (do not output in columns), `auto` (output in
+ columns if the output is to a terminal) or `always` (always output in
+ columns). Setting `--column` or `--no-column` will override this
+ variable. This option defaults to never.
+
add.ignore-errors::
add.ignoreErrors::
Tells 'git add' to continue adding files when some files cannot be
diff --git a/cache.h b/cache.h
index bcbd5f2..1fa7656 100644
--- a/cache.h
+++ b/cache.h
@@ -559,6 +559,7 @@ extern int read_replace_refs;
extern int fsync_object_files;
extern int core_preload_index;
extern int core_apply_sparse_checkout;
+extern int core_column;
enum safe_crlf {
SAFE_CRLF_FALSE = 0,
diff --git a/config.c b/config.c
index 625e051..071899f 100644
--- a/config.c
+++ b/config.c
@@ -9,6 +9,8 @@
#include "exec_cmd.h"
#include "strbuf.h"
#include "quote.h"
+#include "color.h"
+#include "column.h"
#define MAXNAME (256)
@@ -660,6 +662,20 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
+ if (!strcmp(var, "core.column")) {
+ switch (git_config_colorbool(var, value, -1)) {
+ case 0:
+ core_column = COL_PLAIN;
+ break;
+ case 1:
+ core_column = COL_COLUMN_FIRST;
+ break;
+ case -1:
+ return -1;
+ }
+ return 0;
+ }
+
/* Add other config variables here and to Documentation/config.txt. */
return 0;
}
diff --git a/environment.c b/environment.c
index 9564475..b420ea2 100644
--- a/environment.c
+++ b/environment.c
@@ -56,6 +56,7 @@ char *notes_ref_name;
int grafts_replace_parents = 1;
int core_apply_sparse_checkout;
struct startup_info *startup_info;
+int core_column;
/* Parallel index stat data preload? */
int core_preload_index = 0;
--
1.7.2.2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html