diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-19 19:33:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 19:33:57 (GMT) |
| commit | 6f3a0b6da50917569b7f29e1f387da754a6f53e9 (patch) | |
| tree | 62c9040715aa1ec308032795487c460624cf4f2e /builtin | |
| parent | a328b2cb63c39b9df9bdc08d27ee29d80fcd768c (diff) | |
| parent | fd66bcc31ff294cdeaa3e960a3aa7fee619ec3b8 (diff) | |
| download | git-6f3a0b6da50917569b7f29e1f387da754a6f53e9.zip git-6f3a0b6da50917569b7f29e1f387da754a6f53e9.tar.gz git-6f3a0b6da50917569b7f29e1f387da754a6f53e9.tar.bz2 | |
Merge branch 'bw/submodule-config-cleanup'
Recent update to the submodule configuration code broke "diff-tree"
by accidentally stopping to read from the index upfront.
* bw/submodule-config-cleanup:
diff-tree: read the index so attribute checks work in bare repositories
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/diff-tree.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index d664999..b775a75 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -110,6 +110,8 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ init_revisions(opt, prefix); + if (read_cache() < 0) + die(_("index file corrupt")); opt->abbrev = 0; opt->diff = 1; opt->disable_stdin = 1; |