Give short-hands to --pretty=tformat:%formatstring

Allow --pretty="%h %s" (and --format="%h %s") as shorthand for an often
used option --pretty=tformat:"%h %s".

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 159390c35a9413590b83f512c3f9f59e6a275e77..5c6e678aa3d9e75570d5a5578e38b0a45bae720e 100644 (file)
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -152,3 +152,12 @@ $ git log -2 --pretty=tformat:%h 4da45bef \
 4da45be
 7134973
 ---------------------
 4da45be
 7134973
 ---------------------

++
+In addition, any unrecognized string that has a `%` in it is interpreted
+as if it has `tformat:` in front of it.  For example, these two are
+equivalent:
++
+---------------------
+$ git log -2 --pretty=tformat:%h 4da45bef
+$ git log -2 --pretty=%h 4da45bef
+---------------------

diff --git a/pretty.c b/pretty.c
index 6cd91491d348b9aabea902c0ea60465074e9c06e..d739f6d6c52b2258c66e936ac48ac7a4f1adfd7f 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -10,6 +10,15 @@
 
 static char *user_format;
 
 
 static char *user_format;
 

+static void save_user_format(struct rev_info *rev, const char *cp, int is_tformat)
+{
+       free(user_format);
+       user_format = xstrdup(cp);
+       if (is_tformat)
+               rev->use_terminator = 1;
+       rev->commit_format = CMIT_FMT_USERFORMAT;
+}
+

 void get_commit_format(const char *arg, struct rev_info *rev)
 {
        int i;
 void get_commit_format(const char *arg, struct rev_info *rev)
 {
        int i;


@@ -33,12 +42,7 @@ void get_commit_format(const char *arg, struct rev_info *rev)
                return;
        }
        if (!prefixcmp(arg, "format:") || !prefixcmp(arg, "tformat:")) {
                return;
        }
        if (!prefixcmp(arg, "format:") || !prefixcmp(arg, "tformat:")) {

-               const char *cp = strchr(arg, ':') + 1;
-               free(user_format);
-               user_format = xstrdup(cp);
-               if (arg[0] == 't')
-                       rev->use_terminator = 1;
-               rev->commit_format = CMIT_FMT_USERFORMAT;
+               save_user_format(rev, strchr(arg, ':') + 1, arg[0] == 't');

                return;
        }
        for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
                return;
        }
        for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {


@@ -50,6 +54,10 @@ void get_commit_format(const char *arg, struct rev_info *rev)
                        return;
                }
        }
                        return;
                }
        }

+       if (strchr(arg, '%')) {
+               save_user_format(rev, arg, 1);
+               return;
+       }

 
        die("invalid --pretty format: %s", arg);
 }
 
        die("invalid --pretty format: %s", arg);
 }