mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call setup_git_directory() early

Browse Source 
Any git command that expects to work in a subdirectory of a project, and
that reads the git config files (which is just about all of them) needs to
make sure that it does the "setup_git_directory()" call before it tries to
read the config file.

This means, among other things, that we need to move the call out of
"init_revisions()", and into the caller.

This does the mostly trivial conversion to do that.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds
2006-07-28 21:21:48 -07:00
committed by Junio C Hamano
parent 818f477c40
commit db6296a566
12 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-diff.c
View File

@ -227,7 +227,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
struct rev_info rev;
struct object_array_entry ent[100];
int ents = 0, blobs = 0, paths = 0;
const char *path = NULL;
const char *path = NULL, *prefix;
struct blobinfo blob[2];
/*
@ -250,9 +250,9 @@ int cmd_diff(int argc, const char **argv, char **envp)
* Other cases are errors.
*/
init_revisions(&rev);
prefix = setup_git_directory();
git_config(git_diff_ui_config);
diff_setup(&rev.diffopt);
init_revisions(&rev, prefix);
argc = setup_revisions(argc, argv, &rev, NULL);
if (!rev.diffopt.output_format) {