summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorAlex Riesen <raa@limbo.localdomain>2007-07-04 12:37:27 +0200
committerJunio C Hamano <gitster@pobox.com>2007-07-04 12:39:58 -0700
commitd54276f207081e35174c5d742e378cfff6e9843f (patch)
tree201dff66ea327ea1a6a7c975732172381bb6958e /builtin-log.c
parent88c447e8f467c6b2ca09ad91f3fa1d1d662dd04d (diff)
downloadgit-d54276f207081e35174c5d742e378cfff6e9843f.tar.gz
Handle format.subjectprefix for every command which accepts --pretty
Because the --pretty can be given as --pretty=email which historically produced mails with patches. IOW, exactly what git-format-patch does. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 5dc2c1c230..13bae3110e 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -16,6 +16,7 @@
#include "refs.h"
static int default_show_root = 1;
+static const char *fmt_patch_subject_prefix = "PATCH";
/* this is in builtin-diff.c */
void add_head(struct rev_info *revs);
@@ -55,6 +56,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
rev->commit_format = CMIT_FMT_DEFAULT;
rev->verbose_header = 1;
rev->show_root_diff = default_show_root;
+ rev->subject_prefix = fmt_patch_subject_prefix;
argc = setup_revisions(argc, argv, rev, "HEAD");
if (rev->diffopt.pickaxe || rev->diffopt.filter)
rev->always_show_header = 0;
@@ -94,6 +96,12 @@ static int cmd_log_walk(struct rev_info *rev)
static int git_log_config(const char *var, const char *value)
{
+ if (!strcmp(var, "format.subjectprefix")) {
+ if (!value)
+ die("format.subjectprefix without value");
+ fmt_patch_subject_prefix = xstrdup(value);
+ return 0;
+ }
if (!strcmp(var, "log.showroot")) {
default_show_root = git_config_bool(var, value);
return 0;
@@ -265,7 +273,6 @@ static int istitlechar(char c)
static char *extra_headers = NULL;
static int extra_headers_size = 0;
-static const char *fmt_patch_subject_prefix = "PATCH";
static const char *fmt_patch_suffix = ".patch";
static int git_format_config(const char *var, const char *value)
@@ -291,12 +298,6 @@ static int git_format_config(const char *var, const char *value)
if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
return 0;
}
- if (!strcmp(var, "format.subjectprefix")) {
- if (!value)
- die("format.subjectprefix without value");
- fmt_patch_subject_prefix = xstrdup(value);
- return 0;
- }
return git_log_config(var, value);
}