@matheusbsbs / matheus-bagliano / commits / db6296a566
Fork 0

Call setup_git_directory() early

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>

Linus Torvalds committed Jul 28, 2006 at 21:21 UTC db6296a566eb1a8007a84330a911b38055720743
12 files changed +25 -22
blame.c
+1 -1
@@ -834,7 +834,7 @@ int main(int argc, const char **argv)
834 }
835
836
837 - init_revisions(&rev);
837 + init_revisions(&rev, setup_git_directory());
838 rev.remove_empty_trees = 1;
839 rev.topo_order = 1;
840 rev.prune_fn = simplify_commit;
builtin-diff-files.c
+1 -1
@@ -18,7 +18,7 @@ int cmd_diff_files(int argc, const char **argv, char **envp)
18 struct rev_info rev;
19 int silent = 0;
20
21 - init_revisions(&rev);
21 + init_revisions(&rev, setup_git_directory());
22 git_config(git_default_config); /* no "diff" UI options */
23 rev.abbrev = 0;
24
builtin-diff-index.c
+1 -1
@@ -15,7 +15,7 @@ int cmd_diff_index(int argc, const char **argv, char **envp)
15 int cached = 0;
16 int i;
17
18 - init_revisions(&rev);
18 + init_revisions(&rev, setup_git_directory());
19 git_config(git_default_config); /* no "diff" UI options */
20 rev.abbrev = 0;
21
builtin-diff-tree.c
+1 -1
@@ -67,7 +67,7 @@ int cmd_diff_tree(int argc, const char **argv, char **envp)
67 static struct rev_info *opt = &log_tree_opt;
68 int read_stdin = 0;
69
70 - init_revisions(opt);
70 + init_revisions(opt, setup_git_directory());
71 git_config(git_default_config); /* no "diff" UI options */
72 nr_sha1 = 0;
73 opt->abbrev = 0;
builtin-diff.c
+3 -3
@@ -227,7 +227,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
227 struct rev_info rev;
228 struct object_array_entry ent[100];
229 int ents = 0, blobs = 0, paths = 0;
230 - const char *path = NULL;
230 + const char *path = NULL, *prefix;
231 struct blobinfo blob[2];
232
233 /*
@@ -250,9 +250,9 @@ int cmd_diff(int argc, const char **argv, char **envp)
250 * Other cases are errors.
251 */
252
253 - init_revisions(&rev);
253 + prefix = setup_git_directory();
254 git_config(git_diff_ui_config);
255 - diff_setup(&rev.diffopt);
255 + init_revisions(&rev, prefix);
256
257 argc = setup_revisions(argc, argv, &rev, NULL);
258 if (!rev.diffopt.output_format) {
builtin-fmt-merge-msg.c
+2 -1
@@ -250,6 +250,7 @@ int cmd_fmt_merge_msg(int argc, char **argv, char **envp)
250 const char *sep = "";
251 unsigned char head_sha1[20];
252 const char *head, *current_branch;
253 + const char *prefix = setup_git_directory();
254
255 git_config(fmt_merge_msg_config);
256
@@ -342,7 +343,7 @@ int cmd_fmt_merge_msg(int argc, char **argv, char **envp)
343 struct rev_info rev;
344
345 head = lookup_commit(head_sha1);
345 - init_revisions(&rev);
346 + init_revisions(&rev, prefix);
347 rev.commit_format = CMIT_FMT_ONELINE;
348 rev.ignore_merges = 1;
349 rev.limited = 1;
builtin-log.c
+10 -8
@@ -48,10 +48,10 @@ static int cmd_log_walk(struct rev_info *rev)
48 int cmd_whatchanged(int argc, const char **argv, char **envp)
49 {
50 struct rev_info rev;
51 + const char *prefix = setup_git_directory();
52
52 - init_revisions(&rev);
53 git_config(git_diff_ui_config);
54 - diff_setup(&rev.diffopt);
54 + init_revisions(&rev, prefix);
55 rev.diff = 1;
56 rev.diffopt.recursive = 1;
57 rev.simplify_history = 0;
@@ -64,10 +64,10 @@ int cmd_whatchanged(int argc, const char **argv, char **envp)
64 int cmd_show(int argc, const char **argv, char **envp)
65 {
66 struct rev_info rev;
67 + const char *prefix = setup_git_directory();
68
68 - init_revisions(&rev);
69 git_config(git_diff_ui_config);
70 - diff_setup(&rev.diffopt);
70 + init_revisions(&rev, prefix);
71 rev.diff = 1;
72 rev.diffopt.recursive = 1;
73 rev.combine_merges = 1;
@@ -82,10 +82,10 @@ int cmd_show(int argc, const char **argv, char **envp)
82 int cmd_log(int argc, const char **argv, char **envp)
83 {
84 struct rev_info rev;
85 + const char *prefix = setup_git_directory();
86
86 - init_revisions(&rev);
87 git_config(git_diff_ui_config);
88 - diff_setup(&rev.diffopt);
88 + init_revisions(&rev, prefix);
89 rev.always_show_header = 1;
90 cmd_log_init(argc, argv, envp, &rev);
91 return cmd_log_walk(&rev);
@@ -188,6 +188,7 @@ static void get_patch_ids(struct rev_info *rev, struct diff_options *options)
188 struct object *o1, *o2;
189 unsigned flags1, flags2;
190 unsigned char sha1[20];
191 + const char *prefix = setup_git_directory();
192
193 if (rev->pending.nr != 2)
194 die("Need exactly one range.");
@@ -206,7 +207,7 @@ static void get_patch_ids(struct rev_info *rev, struct diff_options *options)
207 die("diff_setup_done failed");
208
209 /* given a range a..b get all patch ids for b..a */
209 - init_revisions(&check_rev);
210 + init_revisions(&check_rev, prefix);
211 o1->flags ^= UNINTERESTING;
212 o2->flags ^= UNINTERESTING;
213 add_pending_object(&check_rev, o1, "o1");
@@ -260,9 +261,10 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
261 char *add_signoff = NULL;
262 char message_id[1024];
263 char ref_message_id[1024];
264 + const char *prefix = setup_git_directory();
265
266 git_config(git_format_config);
265 - init_revisions(&rev);
267 + init_revisions(&rev, prefix);
268 rev.commit_format = CMIT_FMT_EMAIL;
269 rev.verbose_header = 1;
270 rev.diff = 1;
builtin-prune.c
+1 -1
@@ -234,7 +234,7 @@ int cmd_prune(int argc, const char **argv, char **envp)
234 * Set up revision parsing, and mark us as being interested
235 * in all object types, not just commits.
236 */
237 - init_revisions(&revs);
237 + init_revisions(&revs, setup_git_directory());
238 revs.tag_objects = 1;
239 revs.blob_objects = 1;
240 revs.tree_objects = 1;
builtin-rev-list.c
+1 -1
@@ -311,7 +311,7 @@ int cmd_rev_list(int argc, const char **argv, char **envp)
311 struct commit_list *list;
312 int i;
313
314 - init_revisions(&revs);
314 + init_revisions(&revs, setup_git_directory());
315 revs.abbrev = 0;
316 revs.commit_format = CMIT_FMT_UNSPECIFIED;
317 argc = setup_revisions(argc, argv, &revs, NULL);
http-push.c
+1 -1
@@ -2521,7 +2521,7 @@ int main(int argc, char **argv)
2521 commit_argv[3] = old_sha1_hex;
2522 commit_argc++;
2523 }
2524 - init_revisions(&revs);
2524 + init_revisions(&revs, setup_git_directory());
2525 setup_revisions(commit_argc, commit_argv, &revs, NULL);
2526 free(new_sha1_hex);
2527 if (old_sha1_hex) {
revision.c
+2 -2
@@ -509,7 +509,7 @@ static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
509 return 1;
510 }
511
512 -void init_revisions(struct rev_info *revs)
512 +void init_revisions(struct rev_info *revs, const char *prefix)
513 {
514 memset(revs, 0, sizeof(*revs));
515
@@ -521,7 +521,7 @@ void init_revisions(struct rev_info *revs)
521 revs->pruning.change = file_change;
522 revs->lifo = 1;
523 revs->dense = 1;
524 - revs->prefix = setup_git_directory();
524 + revs->prefix = prefix;
525 revs->max_age = -1;
526 revs->min_age = -1;
527 revs->max_count = -1;
revision.h
+1 -1
@@ -87,7 +87,7 @@ struct rev_info {
87 extern int rev_same_tree_as_empty(struct rev_info *, struct tree *t1);
88 extern int rev_compare_tree(struct rev_info *, struct tree *t1, struct tree *t2);
89
90 -extern void init_revisions(struct rev_info *revs);
90 +extern void init_revisions(struct rev_info *revs, const char *prefix);
91 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
92 extern void prepare_revision_walk(struct rev_info *revs);
93 extern struct commit *get_revision(struct rev_info *revs);