config option log.showroot to show the diff of root commits

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 <Peter.B.Baumannn@stud.informatik.uni-erlangen.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9d3c71c3b87a9603973de42c76c4570a94420398..9090762819fac988c63eaa17089c0d4c57a8d338 100644 (file)
--- 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'.
 
        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.
 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 fedb0137bc5e3ba50ecb90ce560ce9ce9290d8df..7acf5d3b0c3393ee700e084470824bb7fd7cf88a 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -13,6 +13,8 @@
 #include <time.h>
 #include <sys/time.h>
 
 #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);
 
 /* 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 char **argv, const char *prefix,
        rev->abbrev = DEFAULT_ABBREV;
        rev->commit_format = CMIT_FMT_DEFAULT;
        rev->verbose_header = 1;
        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;
        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 *rev)
        return 0;
 }
 
        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;
 
 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;
        init_revisions(&rev, prefix);
        rev.diff = 1;
        rev.diffopt.recursive = 1;


@@ -63,7 +75,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
 
 {
        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;
        init_revisions(&rev, prefix);
        rev.diff = 1;
        rev.diffopt.recursive = 1;


@@ -80,7 +92,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
 
 {
        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);
        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 *var, const char *value)
        if (!strcmp(var, "diff.color")) {
                return 0;
        }
        if (!strcmp(var, "diff.color")) {
                return 0;
        }

-       return git_diff_ui_config(var, value);
+       return git_log_config(var, value);

 }
 
 
 }
 
 

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 71c454356fbbcd5f67bdfc0b6ef7785fa8b712c1..ed37141b6e5afd8294c5961a1ab96c634a5f4a82 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -73,6 +73,7 @@ test_expect_success setup '
        for i in 1 2; do echo $i; done >>dir/sub &&
        git update-index file0 dir/sub &&
 
        for i in 1 2; do echo $i; done >>dir/sub &&
        git update-index file0 dir/sub &&
 

+       git repo-config log.showroot false &&

        git commit --amend &&
        git show-branch
 '
        git commit --amend &&
        git show-branch
 '