diff options
| author | Marc Branchaud <marcnarc@xiplink.com> | 2017-05-08 16:03:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-09 03:24:35 (GMT) |
| commit | 37590ce3c535f92e28da83893f843cc0099873bf (patch) | |
| tree | ee64e6f2727e82fc55543c6fc388d23d70427ab8 /builtin | |
| parent | cf5e77223a012737930e1bbacc85c6423b03af77 (diff) | |
| download | git-37590ce3c535f92e28da83893f843cc0099873bf.zip git-37590ce3c535f92e28da83893f843cc0099873bf.tar.gz git-37590ce3c535f92e28da83893f843cc0099873bf.tar.bz2 | |
diff: have the diff-* builtins configure diff before initializing revisions
This matches how the diff Porcelain works. It makes the plumbing commands
respect diff's configuration options, such as indentHeuristic, because
init_revisions() calls diff_setup() which fills in the diff_options struct.
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/diff-files.c | 2 | ||||
| -rw-r--r-- | builtin/diff-index.c | 2 | ||||
| -rw-r--r-- | builtin/diff-tree.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/builtin/diff-files.c b/builtin/diff-files.c index 15c61fd..a572da9 100644 --- a/builtin/diff-files.c +++ b/builtin/diff-files.c @@ -20,9 +20,9 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) int result; unsigned options = 0; + git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ init_revisions(&rev, prefix); gitmodules_config(); - git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ rev.abbrev = 0; precompose_argv(argc, argv); diff --git a/builtin/diff-index.c b/builtin/diff-index.c index 1af373d..f084826 100644 --- a/builtin/diff-index.c +++ b/builtin/diff-index.c @@ -17,9 +17,9 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) int i; int result; + git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ init_revisions(&rev, prefix); gitmodules_config(); - git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ rev.abbrev = 0; precompose_argv(argc, argv); diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index 326f88b..36a3a19 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -105,9 +105,9 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) struct setup_revision_opt s_r_opt; int read_stdin = 0; + git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ init_revisions(opt, prefix); gitmodules_config(); - git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ opt->abbrev = 0; opt->diff = 1; opt->disable_stdin = 1; |