Re: [PATCH] config option core.showroot to enable showing the diff of the root commit
From: Junio C Hamano <hidden>
Date: 2016-08-11 20:04:36
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-08-11 · Re: [PATCH] config option core.showroot to enable showing the diff of the root commit · Junio C Hamano <hidden>
- 2016-08-11 · Re: [PATCH] config option core.showroot to enable showing the diff of the root commit · Peter Baumann <hidden>
- 2016-08-11 · Re: [PATCH] config option core.showroot to enable showing the diff of the root commit · Junio C Hamano <hidden>
- 2016-08-11 · [PATCH] config option core.showroot to enable showing the diff of the root commit · Peter Baumann <hidden>
Junio C Hamano [off-list ref] writes:
Peter Baumann [off-list ref] writes:quoted
Sorry, but I don't understand. The color handling doesn't look any different to me than the handling of the other config entrys. Did I miss something?"git-diff-tree --color HEAD" (with explicit command line instruction to color it) still colours its output, but "[diff] color = auto" in ~/.gitconfig would not affect the coloring. Hence, "git-diff-tree HEAD" with the configuration entry gives monochrome. "git diff HEAD" on the other hand looks at '[diff] color = auto" and will color its output without being told on the command line.
Since this is about "log" family that deals with revision structure, how about.... -- >8 -- [PATCH] config option log.showroot to show the diff of root commits From: Peter Baumann <redacted> This allows one to see a root commit as a diff in commands like git-log, git-show and git-whatchanged. Signed-off-by: Peter Baumann <redacted> Signed-off-by: Junio C Hamano <redacted> --- Documentation/config.txt | 6 ++++++ builtin-log.c | 20 ++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9d3c71c..9090762 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt@@ -219,6 +219,12 @@ i18n.commitEncoding:: browser (and possibly at other places in the future or in other porcelains). See e.g. gitlink:git-mailinfo[1]. Defaults to 'utf-8'. +log.showroot:: + If true, the initial commit will be shown as a big creation event. + This is equivalent to a diff against an empty tree. + Tools like gitlink:git-log[1] or gitlink:git-whatchanged[1], which + normally hide the root commit will now show it. True by default. + merge.summary:: Whether to include summaries of merged commits in newly created merge commit messages. False by default.
diff --git a/builtin-log.c b/builtin-log.c
index fedb013..7acf5d3 100644
--- a/builtin-log.c
+++ b/builtin-log.c@@ -13,6 +13,8 @@ #include <time.h> #include <sys/time.h> +static int default_show_root = 1; + /* this is in builtin-diff.c */ void add_head(struct rev_info *revs);
@@ -22,6 +24,7 @@ static void cmd_log_init(int argc, const rev->abbrev = DEFAULT_ABBREV; rev->commit_format = CMIT_FMT_DEFAULT; rev->verbose_header = 1; + rev->show_root_diff = default_show_root; argc = setup_revisions(argc, argv, rev, "HEAD"); if (rev->diffopt.pickaxe || rev->diffopt.filter) rev->always_show_header = 0;
@@ -44,11 +47,20 @@ static int cmd_log_walk(struct rev_info return 0; } +static int git_log_config(const char *var, const char *value) +{ + if (!strcmp(var, "log.showroot")) { + default_show_root = git_config_bool(var, value); + return 0; + } + return git_diff_ui_config(var, value); +} + int cmd_whatchanged(int argc, const char **argv, const char *prefix) { struct rev_info rev; - git_config(git_diff_ui_config); + git_config(git_log_config); init_revisions(&rev, prefix); rev.diff = 1; rev.diffopt.recursive = 1;
@@ -63,7 +75,7 @@ int cmd_show(int argc, const char **argv { struct rev_info rev; - git_config(git_diff_ui_config); + git_config(git_log_config); init_revisions(&rev, prefix); rev.diff = 1; rev.diffopt.recursive = 1;
@@ -80,7 +92,7 @@ int cmd_log(int argc, const char **argv, { struct rev_info rev; - git_config(git_diff_ui_config); + git_config(git_log_config); init_revisions(&rev, prefix); rev.always_show_header = 1; cmd_log_init(argc, argv, prefix, &rev);
@@ -109,7 +121,7 @@ static int git_format_config(const char if (!strcmp(var, "diff.color")) { return 0; } - return git_diff_ui_config(var, value); + return git_log_config(var, value); }
--
1.4.4.1.g77614