diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-21 23:03:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-21 23:03:17 (GMT) |
| commit | 8d2c37320bd01bbce4b88365c160bc4a542bee48 (patch) | |
| tree | d805155422fb863b694eaaeb71967d9667f9e81d /builtin/blame.c | |
| parent | 3f9d5059c66f45ac75dd701b0798d3891150c1e7 (diff) | |
| parent | add4c864b60766174ad4f74ba7be17e66d61ef16 (diff) | |
| download | git-8d2c37320bd01bbce4b88365c160bc4a542bee48.zip git-8d2c37320bd01bbce4b88365c160bc4a542bee48.tar.gz git-8d2c37320bd01bbce4b88365c160bc4a542bee48.tar.bz2 | |
Merge branch 'ld/sparse-diff-blame'
Teach diff and blame to work well with sparse index.
* ld/sparse-diff-blame:
blame: enable and test the sparse index
diff: enable and test the sparse index
diff: replace --staged with --cached in t1092 tests
repo-settings: prepare_repo_settings only in git repos
test-read-cache: set up repo after git directory
commit-graph: return if there is no git directory
git: ensure correct git directory setup with -h
Diffstat (limited to 'builtin/blame.c')
| -rw-r--r-- | builtin/blame.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index f9ee3f8..7fafeac 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -939,6 +939,9 @@ parse_done: revs.diffopt.flags.follow_renames = 0; argc = parse_options_end(&ctx); + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; + if (incremental || (output_option & OUTPUT_PORCELAIN)) { if (show_progress > 0) die(_("--progress can't be used with --incremental or porcelain formats")); |