diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-20 15:53:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-20 15:53:13 -0700 |
| commit | de00f4b7f3fd3aca18e4bea286bf060c595efd3b (patch) | |
| tree | 48131ebe8ff1e9980da040c9afa61b738995769b /builtin | |
| parent | 7cb4274d2606775b0d5b373756f76f386a31bb64 (diff) | |
| parent | 8260bc59023136edeaed1f1006a03f44cc849883 (diff) | |
| download | git-de00f4b7f3fd3aca18e4bea286bf060c595efd3b.tar.gz | |
Merge branch 'jk/log-follow-with-non-literal-pathspec'
"git [-c log.follow=true] log [--follow] ':(glob)f**'" used to barf.
* jk/log-follow-with-non-literal-pathspec:
diff: detect pathspec magic not supported by --follow
diff: factor out --follow pathspec check
pathspec: factor out magic-to-name function
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 4c45a47ecf..c85f13a5d5 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -866,7 +866,7 @@ static void log_setup_revisions_tweak(struct rev_info *rev, struct setup_revision_opt *opt) { if (rev->diffopt.flags.default_follow_renames && - rev->prune_data.nr == 1) + diff_check_follow_pathspec(&rev->prune_data, 0)) rev->diffopt.flags.follow_renames = 1; if (rev->first_parent_only) |