summaryrefslogtreecommitdiff
path: root/builtin-diff-stages.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-08 08:05:16 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-08 10:11:01 (GMT)
commit83ad63cfebdf652ff7c7b255d700d8b12c756913 (patch)
treed23227484e77cc05bd534675554279f174cf7642 /builtin-diff-stages.c
parentb53766483ff14f73be954617349b18ea56c3187a (diff)
downloadgit-83ad63cfebdf652ff7c7b255d700d8b12c756913.zip
git-83ad63cfebdf652ff7c7b255d700d8b12c756913.tar.gz
git-83ad63cfebdf652ff7c7b255d700d8b12c756913.tar.bz2
diff: do not use configuration magic at the core-level
The Porcelainish has become so much usable as the UI that there is not much reason people should be using the core programs by hand anymore. At this point we are better off making the behaviour of the core programs predictable by keeping them unaffected by the configuration variables. Otherwise they will become very hard to use as reliable building blocks. For example, "git-commit -a" internally uses git-diff-files to figure out the set of paths that need to be updated in the index, and we should never allow diff.renames that happens to be in the configuration to interfere (or slow down the process). The UI level configuration such as showing renamed diff and coloring are still honored by the Porcelainish ("git log" family and "git diff"), but not by the core anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-diff-stages.c')
-rw-r--r--builtin-diff-stages.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff-stages.c b/builtin-diff-stages.c
index 30931fe..9c62702 100644
--- a/builtin-diff-stages.c
+++ b/builtin-diff-stages.c
@@ -61,7 +61,7 @@ int cmd_diff_stages(int ac, const char **av, char **envp)
const char *prefix = setup_git_directory();
const char **pathspec = NULL;
- git_config(git_diff_config);
+ git_config(git_default_config); /* no "diff" UI options */
read_cache();
diff_setup(&diff_options);
while (1 < ac && av[1][0] == '-') {