summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-12-09 13:10:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-09 21:37:21 (GMT)
commit09ac67a1839eda984b172d4d75153c767d6bbf14 (patch)
tree6c0965e3887a42bcba8cc57445f29a03422a4367 /builtin/log.c
parent8164c961e16834da283cbf5ac5d22313b982a484 (diff)
downloadgit-09ac67a1839eda984b172d4d75153c767d6bbf14.zip
git-09ac67a1839eda984b172d4d75153c767d6bbf14.tar.gz
git-09ac67a1839eda984b172d4d75153c767d6bbf14.tar.bz2
format-patch: move git_config() before repo_init_revisions()
In 13cdf78094 (format-patch: teach format.notes config option, 2019-05-16), the order in which git_config() and repo_init_revisions() were swapped so that `rev.notes_opt` would be initialized before git_config() was called. This is problematic, however, as git_config() should generally be called before repo_init_revisions(). Break this circular dependency by creating `show_notes` and `notes_opt` which git_config() reads into. Then, copy these values over to `rev.show_notes` and `rev.notes_opt` after repo_init_revisions() is called. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 1f0405f..4225615 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -769,6 +769,8 @@ static const char *signature = git_version_string;
static const char *signature_file;
static int config_cover_letter;
static const char *config_output_directory;
+static int show_notes;
+static struct display_notes_opt notes_opt;
enum {
COVER_UNSET,
@@ -779,8 +781,6 @@ enum {
static int git_format_config(const char *var, const char *value, void *cb)
{
- struct rev_info *rev = cb;
-
if (!strcmp(var, "format.headers")) {
if (!value)
die(_("format.headers without value"));
@@ -868,7 +868,7 @@ static int git_format_config(const char *var, const char *value, void *cb)
}
if (!strcmp(var, "format.notes")) {
int b = git_parse_maybe_bool(value);
- rev->show_notes = set_display_notes(&rev->notes_opt, b, b < 0 ? value : NULL);
+ show_notes = set_display_notes(&notes_opt, b, b < 0 ? value : NULL);
return 0;
}
@@ -1624,8 +1624,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
extra_to.strdup_strings = 1;
extra_cc.strdup_strings = 1;
init_log_defaults();
+ init_display_notes(&notes_opt);
+ git_config(git_format_config, NULL);
repo_init_revisions(the_repository, &rev, prefix);
- git_config(git_format_config, &rev);
+ rev.show_notes = show_notes;
+ memcpy(&rev.notes_opt, &notes_opt, sizeof(notes_opt));
rev.commit_format = CMIT_FMT_EMAIL;
rev.expand_tabs_in_log_default = 0;
rev.verbose_header = 1;