Skip to content

Commit 2dded96

Browse files
gitstergitster
committed
Merge branch 'dt/log-follow-config'
Add a new configuration variable to enable "--follow" automatically when "git log" is run with one pathspec argument. * dt/log-follow-config: log: add "log.follow" configuration variable
2 parents 178d2c7 + 076c983 commit 2dded96

5 files changed

Lines changed: 49 additions & 2 deletions

File tree

‎Documentation/git-log.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,12 @@ log.date::
184184
`--date` option.) Defaults to "default", which means to write
185185
dates like `Sat May 8 19:35:34 2010 -0500`.
186186

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+
187193
log.showRoot::
188194
If `false`, `git log` and related commands will not treat the
189195
initial commit as a big creation event. Any root commits in

‎builtin/log.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ static const char *default_date_mode = NULL;
3232

3333
static int default_abbrev_commit;
3434
static int default_show_root = 1;
35+
static int default_follow;
3536
static int decoration_style;
3637
static int decoration_given;
3738
static int use_mailmap_config;
@@ -103,6 +104,8 @@ static void cmd_log_init_defaults(struct rev_info *rev)
103104
{
104105
if (fmt_pretty)
105106
get_commit_format(fmt_pretty, rev);
107+
if (default_follow)
108+
DIFF_OPT_SET(&rev->diffopt, DEFAULT_FOLLOW_RENAMES);
106109
rev->verbose_header = 1;
107110
DIFF_OPT_SET(&rev->diffopt, RECURSIVE);
108111
rev->diffopt.stat_width = -1; /* use full terminal width */
@@ -391,6 +394,10 @@ static int git_log_config(const char *var, const char *value, void *cb)
391394
default_show_root = git_config_bool(var, value);
392395
return 0;
393396
}
397+
if (!strcmp(var, "log.follow")) {
398+
default_follow = git_config_bool(var, value);
399+
return 0;
400+
}
394401
if (skip_prefix(var, "color.decorate.", &slot_name))
395402
return parse_decorate_color_config(var, slot_name, value);
396403
if (!strcmp(var, "log.mailmap")) {
@@ -619,6 +626,14 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix)
619626
return cmd_log_walk(&rev);
620627
}
621628

629+
static void default_follow_tweak(struct rev_info *rev,
630+
struct setup_revision_opt *opt)
631+
{
632+
if (DIFF_OPT_TST(&rev->diffopt, DEFAULT_FOLLOW_RENAMES) &&
633+
rev->prune_data.nr == 1)
634+
DIFF_OPT_SET(&rev->diffopt, FOLLOW_RENAMES);
635+
}
636+
622637
int cmd_log(int argc, const char **argv, const char *prefix)
623638
{
624639
struct rev_info rev;
@@ -632,6 +647,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)
632647
memset(&opt, 0, sizeof(opt));
633648
opt.def = "HEAD";
634649
opt.revarg_opt = REVARG_COMMITTISH;
650+
opt.tweak = default_follow_tweak;
635651
cmd_log_init(argc, argv, prefix, &rev, &opt);
636652
return cmd_log_walk(&rev);
637653
}

‎diff.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3820,9 +3820,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
38203820
DIFF_OPT_SET(options, FIND_COPIES_HARDER);
38213821
else if (!strcmp(arg, "--follow"))
38223822
DIFF_OPT_SET(options, FOLLOW_RENAMES);
3823-
else if (!strcmp(arg, "--no-follow"))
3823+
else if (!strcmp(arg, "--no-follow")) {
38243824
DIFF_OPT_CLR(options, FOLLOW_RENAMES);
3825-
else if (!strcmp(arg, "--color"))
3825+
DIFF_OPT_CLR(options, DEFAULT_FOLLOW_RENAMES);
3826+
} else if (!strcmp(arg, "--color"))
38263827
options->use_color = 1;
38273828
else if (skip_prefix(arg, "--color=", &arg)) {
38283829
int value = git_config_colorbool(NULL, arg);

‎diff.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
9191
#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
9292
#define DIFF_OPT_FUNCCONTEXT (1 << 29)
9393
#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
94+
#define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1 << 31)
9495

9596
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
9697
#define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags & DIFF_OPT_##flag)

‎t/t4202-log.sh‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,30 @@ test_expect_success 'git log --follow' '
146146
actual=$(git log --follow --pretty="format:%s" ichi) &&
147147
expect=$(echo third ; echo second ; echo initial) &&
148148
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+
'
149157

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"
150173
'
151174

152175
cat > expect << EOF

0 commit comments

Comments
 (0)