log: add "log.follow" configuration variable
People who work on projects with mostly linear history with frequent whole file renames may want to always use "git log --follow" when inspecting the life of the content that live in a single path. Teach the command to behave as if "--follow" was given from the command line when log.follow configuration variable is set *and* there is one (and only one) path on the command line. Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Turner committed
Jul 7, 2015 at 21:29 UTC
076c98372e7d3c86d269c1526349a67b73904330
5 files changed
+49
-2
Documentation/git-log.txt
+6
@@ -184,6 +184,12 @@ log.date::
184
`--date` option.) Defaults to "default", which means to write
185
dates like `Sat May 8 19:35:34 2010 -0500`.
186
187
+log.follow::
188
+ If a single <path> is given to git log, it will act as
189
+ if the `--follow` option was also used. This has the same
190
+ limitations as `--follow`, i.e. it cannot be used to follow
191
+ multiple files and does not work well on non-linear history.
192
+
193
log.showRoot::
194
If `false`, `git log` and related commands will not treat the
195
initial commit as a big creation event. Any root commits in
builtin/log.c
+16
@@ -31,6 +31,7 @@ static const char *default_date_mode = NULL;
31
32
static int default_abbrev_commit;
33
static int default_show_root = 1;
34
+static int default_follow;
35
static int decoration_style;
36
static int decoration_given;
37
static int use_mailmap_config;
@@ -102,6 +103,8 @@ static void cmd_log_init_defaults(struct rev_info *rev)
103
{
104
if (fmt_pretty)
105
get_commit_format(fmt_pretty, rev);
106
+ if (default_follow)
107
+ DIFF_OPT_SET(&rev->diffopt, DEFAULT_FOLLOW_RENAMES);
108
rev->verbose_header = 1;
109
DIFF_OPT_SET(&rev->diffopt, RECURSIVE);
110
rev->diffopt.stat_width = -1; /* use full terminal width */
@@ -390,6 +393,10 @@ static int git_log_config(const char *var, const char *value, void *cb)
393
default_show_root = git_config_bool(var, value);
394
return 0;
395
}
396
+ if (!strcmp(var, "log.follow")) {
397
+ default_follow = git_config_bool(var, value);
398
+ return 0;
399
+ }
400
if (skip_prefix(var, "color.decorate.", &slot_name))
401
return parse_decorate_color_config(var, slot_name, value);
402
if (!strcmp(var, "log.mailmap")) {
@@ -618,6 +625,14 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix)
625
return cmd_log_walk(&rev);
626
}
627
628
+static void default_follow_tweak(struct rev_info *rev,
629
+ struct setup_revision_opt *opt)
630
+{
631
+ if (DIFF_OPT_TST(&rev->diffopt, DEFAULT_FOLLOW_RENAMES) &&
632
+ rev->prune_data.nr == 1)
633
+ DIFF_OPT_SET(&rev->diffopt, FOLLOW_RENAMES);
634
+}
635
+
636
int cmd_log(int argc, const char **argv, const char *prefix)
637
{
638
struct rev_info rev;
@@ -631,6 +646,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)
646
memset(&opt, 0, sizeof(opt));
647
opt.def = "HEAD";
648
opt.revarg_opt = REVARG_COMMITTISH;
649
+ opt.tweak = default_follow_tweak;
650
cmd_log_init(argc, argv, prefix, &rev, &opt);
651
return cmd_log_walk(&rev);
652
}
diff.c
+3
-2
@@ -3815,9 +3815,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
3815
DIFF_OPT_SET(options, FIND_COPIES_HARDER);
3816
else if (!strcmp(arg, "--follow"))
3817
DIFF_OPT_SET(options, FOLLOW_RENAMES);
3818
- else if (!strcmp(arg, "--no-follow"))
3818
+ else if (!strcmp(arg, "--no-follow")) {
3819
DIFF_OPT_CLR(options, FOLLOW_RENAMES);
3820
- else if (!strcmp(arg, "--color"))
3820
+ DIFF_OPT_CLR(options, DEFAULT_FOLLOW_RENAMES);
3821
+ } else if (!strcmp(arg, "--color"))
3822
options->use_color = 1;
3823
else if (skip_prefix(arg, "--color=", &arg)) {
3824
int value = git_config_colorbool(NULL, arg);
diff.h
+1
@@ -91,6 +91,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
91
#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
92
#define DIFF_OPT_FUNCCONTEXT (1 << 29)
93
#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
94
+#define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1 << 31)
95
96
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
97
#define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags & DIFF_OPT_##flag)
t/t4202-log.sh
+23
@@ -146,7 +146,30 @@ test_expect_success 'git log --follow' '
146
actual=$(git log --follow --pretty="format:%s" ichi) &&
147
expect=$(echo third ; echo second ; echo initial) &&
148
verbose test "$actual" = "$expect"
149
+'
150
+
151
+test_expect_success 'git config log.follow works like --follow' '
152
+ test_config log.follow true &&
153
+ actual=$(git log --pretty="format:%s" ichi) &&
154
+ expect=$(echo third ; echo second ; echo initial) &&
155
+ verbose test "$actual" = "$expect"
156
+'
157
158
+test_expect_success 'git config log.follow does not die with multiple paths' '
159
+ test_config log.follow true &&
160
+ git log --pretty="format:%s" ichi ein
161
+'
162
+
163
+test_expect_success 'git config log.follow does not die with no paths' '
164
+ test_config log.follow true &&
165
+ git log --
166
+'
167
+
168
+test_expect_success 'git config log.follow is overridden by --no-follow' '
169
+ test_config log.follow true &&
170
+ actual=$(git log --no-follow --pretty="format:%s" ichi) &&
171
+ expect="third" &&
172
+ verbose test "$actual" = "$expect"
173
'
174
175
cat > expect << EOF