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

Call setup_git_directory() much earlier

This changes the calling convention of built-in commands and passes the "prefix" (i.e. pathname of $PWD relative to the project root level) down to them. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Jul 28, 2006 at 22:44 UTC a633fca0c056aa221d23493c276d3713191621b3
35 files changed +128 -144
builtin-add.c
+1 -2
@@ -123,11 +123,10 @@ static int add_file_to_index(const char *path, int verbose)
123
124 static struct lock_file lock_file;
125
126 -int cmd_add(int argc, const char **argv, char **envp)
126 +int cmd_add(int argc, const char **argv, const char *prefix)
127 {
128 int i, newfd;
129 int verbose = 0, show_only = 0;
130 - const char *prefix = setup_git_directory();
130 const char **pathspec;
131 struct dir_struct dir;
132
builtin-apply.c
+1 -1
@@ -2268,7 +2268,7 @@ static int git_apply_config(const char *var, const char *value)
2268 }
2269
2270
2271 -int cmd_apply(int argc, const char **argv, char **envp)
2271 +int cmd_apply(int argc, const char **argv, const char *prefix)
2272 {
2273 int i;
2274 int read_stdin = 1;
builtin-cat-file.c
+1 -2
@@ -94,7 +94,7 @@ static int pprint_tag(const unsigned char *sha1, const char *buf, unsigned long
94 return 0;
95 }
96
97 -int cmd_cat_file(int argc, const char **argv, char **envp)
97 +int cmd_cat_file(int argc, const char **argv, const char *prefix)
98 {
99 unsigned char sha1[20];
100 char type[20];
@@ -102,7 +102,6 @@ int cmd_cat_file(int argc, const char **argv, char **envp)
102 unsigned long size;
103 int opt;
104
105 - setup_git_directory();
105 git_config(git_default_config);
106 if (argc != 3)
107 usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
builtin-check-ref-format.c
+1 -1
@@ -6,7 +6,7 @@
6 #include "refs.h"
7 #include "builtin.h"
8
9 -int cmd_check_ref_format(int argc, const char **argv, char **envp)
9 +int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
10 {
11 if (argc != 2)
12 usage("git check-ref-format refname");
builtin-commit-tree.c
+1 -3
@@ -77,7 +77,7 @@ static int new_parent(int idx)
77 return 1;
78 }
79
80 -int cmd_commit_tree(int argc, const char **argv, char **envp)
80 +int cmd_commit_tree(int argc, const char **argv, const char *prefix)
81 {
82 int i;
83 int parents = 0;
@@ -88,8 +88,6 @@ int cmd_commit_tree(int argc, const char **argv, char **envp)
88 unsigned int size;
89
90 setup_ident();
91 - setup_git_directory();
92 -
91 git_config(git_default_config);
92
93 if (argc < 2)
builtin-count.c
+1 -1
@@ -67,7 +67,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,
67 }
68 }
69
70 -int cmd_count_objects(int ac, const char **av, char **ep)
70 +int cmd_count_objects(int ac, const char **av, const char *prefix)
71 {
72 int i;
73 int verbose = 0;
builtin-diff-files.c
+2 -2
@@ -13,12 +13,12 @@ static const char diff_files_usage[] =
13 "git-diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
14 COMMON_DIFF_OPTIONS_HELP;
15
16 -int cmd_diff_files(int argc, const char **argv, char **envp)
16 +int cmd_diff_files(int argc, const char **argv, const char *prefix)
17 {
18 struct rev_info rev;
19 int silent = 0;
20
21 - init_revisions(&rev, setup_git_directory());
21 + init_revisions(&rev, prefix);
22 git_config(git_default_config); /* no "diff" UI options */
23 rev.abbrev = 0;
24
builtin-diff-index.c
+2 -2
@@ -9,13 +9,13 @@ static const char diff_cache_usage[] =
9 "[<common diff options>] <tree-ish> [<path>...]"
10 COMMON_DIFF_OPTIONS_HELP;
11
12 -int cmd_diff_index(int argc, const char **argv, char **envp)
12 +int cmd_diff_index(int argc, const char **argv, const char *prefix)
13 {
14 struct rev_info rev;
15 int cached = 0;
16 int i;
17
18 - init_revisions(&rev, setup_git_directory());
18 + init_revisions(&rev, prefix);
19 git_config(git_default_config); /* no "diff" UI options */
20 rev.abbrev = 0;
21
builtin-diff-stages.c
+1 -2
@@ -55,10 +55,9 @@ static void diff_stages(int stage1, int stage2, const char **pathspec)
55 }
56 }
57
58 -int cmd_diff_stages(int ac, const char **av, char **envp)
58 +int cmd_diff_stages(int ac, const char **av, const char *prefix)
59 {
60 int stage1, stage2;
61 - const char *prefix = setup_git_directory();
61 const char **pathspec = NULL;
62
63 git_config(git_default_config); /* no "diff" UI options */
builtin-diff-tree.c
+2 -2
@@ -59,7 +59,7 @@ static const char diff_tree_usage[] =
59 " --root include the initial commit as diff against /dev/null\n"
60 COMMON_DIFF_OPTIONS_HELP;
61
62 -int cmd_diff_tree(int argc, const char **argv, char **envp)
62 +int cmd_diff_tree(int argc, const char **argv, const char *prefix)
63 {
64 int nr_sha1;
65 char line[1000];
@@ -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, setup_git_directory());
70 + init_revisions(opt, prefix);
71 git_config(git_default_config); /* no "diff" UI options */
72 nr_sha1 = 0;
73 opt->abbrev = 0;
builtin-diff.c
+2 -3
@@ -221,13 +221,13 @@ void add_head(struct rev_info *revs)
221 add_pending_object(revs, obj, "HEAD");
222 }
223
224 -int cmd_diff(int argc, const char **argv, char **envp)
224 +int cmd_diff(int argc, const char **argv, const char *prefix)
225 {
226 int i;
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, *prefix;
230 + const char *path = NULL;
231 struct blobinfo blob[2];
232
233 /*
@@ -250,7 +250,6 @@ int cmd_diff(int argc, const char **argv, char **envp)
250 * Other cases are errors.
251 */
252
253 - prefix = setup_git_directory();
253 git_config(git_diff_ui_config);
254 init_revisions(&rev, prefix);
255
builtin-fmt-merge-msg.c
+1 -2
@@ -242,7 +242,7 @@ static void shortlog(const char *name, unsigned char *sha1,
242 free_list(&subjects);
243 }
244
245 -int cmd_fmt_merge_msg(int argc, char **argv, char **envp)
245 +int cmd_fmt_merge_msg(int argc, char **argv, const char *prefix)
246 {
247 int limit = 20, i = 0;
248 char line[1024];
@@ -250,7 +250,6 @@ 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();
253
254 git_config(fmt_merge_msg_config);
255
builtin-grep.c
+1 -2
@@ -919,14 +919,13 @@ static const char emsg_missing_context_len[] =
919 static const char emsg_missing_argument[] =
920 "option requires an argument -%s";
921
922 -int cmd_grep(int argc, const char **argv, char **envp)
922 +int cmd_grep(int argc, const char **argv, const char *prefix)
923 {
924 int hit = 0;
925 int cached = 0;
926 int seen_dashdash = 0;
927 struct grep_opt opt;
928 struct object_array list = { 0, 0, NULL };
929 - const char *prefix = setup_git_directory();
929 const char **paths = NULL;
930 int i;
931
builtin-help.c
+2 -2
@@ -221,13 +221,13 @@ static void show_man_page(const char *git_cmd)
221 execlp("man", "man", page, NULL);
222 }
223
224 -int cmd_version(int argc, const char **argv, char **envp)
224 +int cmd_version(int argc, const char **argv, const char *prefix)
225 {
226 printf("git version %s\n", git_version_string);
227 return 0;
228 }
229
230 -int cmd_help(int argc, const char **argv, char **envp)
230 +int cmd_help(int argc, const char **argv, const char *prefix)
231 {
232 const char *help_cmd = argc > 1 ? argv[1] : NULL;
233 if (!help_cmd)
builtin-init-db.c
+1 -1
@@ -250,7 +250,7 @@ static const char init_db_usage[] =
250 * On the other hand, it might just make lookup slower and messier. You
251 * be the judge. The default case is to have one DB per managed directory.
252 */
253 -int cmd_init_db(int argc, const char **argv, char **envp)
253 +int cmd_init_db(int argc, const char **argv, const char *prefix)
254 {
255 const char *git_dir;
256 const char *sha1_dir;
builtin-log.c
+10 -15
@@ -16,7 +16,7 @@
16 /* this is in builtin-diff.c */
17 void add_head(struct rev_info *revs);
18
19 -static void cmd_log_init(int argc, const char **argv, char **envp,
19 +static void cmd_log_init(int argc, const char **argv, const char *prefix,
20 struct rev_info *rev)
21 {
22 rev->abbrev = DEFAULT_ABBREV;
@@ -45,26 +45,24 @@ static int cmd_log_walk(struct rev_info *rev)
45 return 0;
46 }
47
48 -int cmd_whatchanged(int argc, const char **argv, char **envp)
48 +int cmd_whatchanged(int argc, const char **argv, const char *prefix)
49 {
50 struct rev_info rev;
51 - const char *prefix = setup_git_directory();
51
52 git_config(git_diff_ui_config);
53 init_revisions(&rev, prefix);
54 rev.diff = 1;
55 rev.diffopt.recursive = 1;
56 rev.simplify_history = 0;
58 - cmd_log_init(argc, argv, envp, &rev);
57 + cmd_log_init(argc, argv, prefix, &rev);
58 if (!rev.diffopt.output_format)
59 rev.diffopt.output_format = DIFF_FORMAT_RAW;
60 return cmd_log_walk(&rev);
61 }
62
64 -int cmd_show(int argc, const char **argv, char **envp)
63 +int cmd_show(int argc, const char **argv, const char *prefix)
64 {
65 struct rev_info rev;
67 - const char *prefix = setup_git_directory();
66
67 git_config(git_diff_ui_config);
68 init_revisions(&rev, prefix);
@@ -75,19 +73,18 @@ int cmd_show(int argc, const char **argv, char **envp)
73 rev.always_show_header = 1;
74 rev.ignore_merges = 0;
75 rev.no_walk = 1;
78 - cmd_log_init(argc, argv, envp, &rev);
76 + cmd_log_init(argc, argv, prefix, &rev);
77 return cmd_log_walk(&rev);
78 }
79
82 -int cmd_log(int argc, const char **argv, char **envp)
80 +int cmd_log(int argc, const char **argv, const char *prefix)
81 {
82 struct rev_info rev;
85 - const char *prefix = setup_git_directory();
83
84 git_config(git_diff_ui_config);
85 init_revisions(&rev, prefix);
86 rev.always_show_header = 1;
90 - cmd_log_init(argc, argv, envp, &rev);
87 + cmd_log_init(argc, argv, prefix, &rev);
88 return cmd_log_walk(&rev);
89 }
90
@@ -181,14 +178,13 @@ static int get_patch_id(struct commit *commit, struct diff_options *options,
178 return diff_flush_patch_id(options, sha1);
179 }
180
184 -static void get_patch_ids(struct rev_info *rev, struct diff_options *options)
181 +static void get_patch_ids(struct rev_info *rev, struct diff_options *options, const char *prefix)
182 {
183 struct rev_info check_rev;
184 struct commit *commit;
185 struct object *o1, *o2;
186 unsigned flags1, flags2;
187 unsigned char sha1[20];
191 - const char *prefix = setup_git_directory();
188
189 if (rev->pending.nr != 2)
190 die("Need exactly one range.");
@@ -244,7 +240,7 @@ static void gen_message_id(char *dest, unsigned int length, char *base)
240 (int)(email_end - email_start - 1), email_start + 1);
241 }
242
247 -int cmd_format_patch(int argc, const char **argv, char **envp)
243 +int cmd_format_patch(int argc, const char **argv, const char *prefix)
244 {
245 struct commit *commit;
246 struct commit **list = NULL;
@@ -261,7 +257,6 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
257 char *add_signoff = NULL;
258 char message_id[1024];
259 char ref_message_id[1024];
264 - const char *prefix = setup_git_directory();
260
261 git_config(git_format_config);
262 init_revisions(&rev, prefix);
@@ -368,7 +363,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
363 }
364
365 if (ignore_if_in_upstream)
371 - get_patch_ids(&rev, &patch_id_opts);
366 + get_patch_ids(&rev, &patch_id_opts, prefix);
367
368 if (!use_stdout)
369 realstdout = fdopen(dup(1), "w");
builtin-ls-files.c
+1 -2
@@ -322,14 +322,13 @@ static const char ls_files_usage[] =
322 "[ --exclude-per-directory=<filename> ] [--full-name] [--abbrev] "
323 "[--] [<file>]*";
324
325 -int cmd_ls_files(int argc, const char **argv, char** envp)
325 +int cmd_ls_files(int argc, const char **argv, const char *prefix)
326 {
327 int i;
328 int exc_given = 0;
329 struct dir_struct dir;
330
331 memset(&dir, 0, sizeof(dir));
332 - prefix = setup_git_directory();
332 if (prefix)
333 prefix_offset = strlen(prefix);
334 git_config(git_default_config);
builtin-ls-tree.c
+4 -4
@@ -18,7 +18,7 @@ static int abbrev = 0;
18 static int ls_options = 0;
19 static const char **pathspec;
20 static int chomp_prefix = 0;
21 -static const char *prefix;
21 +static const char *ls_tree_prefix;
22
23 static const char ls_tree_usage[] =
24 "git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] [--full-name] [--abbrev[=<n>]] <tree-ish> [path...]";
@@ -71,7 +71,7 @@ static int show_tree(const unsigned char *sha1, const char *base, int baselen,
71 return 0;
72
73 if (chomp_prefix &&
74 - (baselen < chomp_prefix || memcmp(prefix, base, chomp_prefix)))
74 + (baselen < chomp_prefix || memcmp(ls_tree_prefix, base, chomp_prefix)))
75 return 0;
76
77 if (!(ls_options & LS_NAME_ONLY))
@@ -85,13 +85,13 @@ static int show_tree(const unsigned char *sha1, const char *base, int baselen,
85 return retval;
86 }
87
88 -int cmd_ls_tree(int argc, const char **argv, char **envp)
88 +int cmd_ls_tree(int argc, const char **argv, const char *prefix)
89 {
90 unsigned char sha1[20];
91 struct tree *tree;
92
93 - prefix = setup_git_directory();
93 git_config(git_default_config);
94 + ls_tree_prefix = prefix;
95 if (prefix && *prefix)
96 chomp_prefix = strlen(prefix);
97 while (1 < argc && argv[1][0] == '-') {
builtin-mailinfo.c
+1 -1
@@ -836,7 +836,7 @@ int mailinfo(FILE *in, FILE *out, int ks, const char *encoding,
836 static const char mailinfo_usage[] =
837 "git-mailinfo [-k] [-u | --encoding=<encoding>] msg patch <mail >info";
838
839 -int cmd_mailinfo(int argc, const char **argv, char **envp)
839 +int cmd_mailinfo(int argc, const char **argv, const char *prefix)
840 {
841 /* NEEDSWORK: might want to do the optional .git/ directory
842 * discovery
builtin-mailsplit.c
+1 -1
@@ -138,7 +138,7 @@ out:
138 free(name);
139 return ret;
140 }
141 -int cmd_mailsplit(int argc, const char **argv, char **envp)
141 +int cmd_mailsplit(int argc, const char **argv, const char *prefix)
142 {
143 int nr = 0, nr_prec = 4, ret;
144 int allow_bare = 0;
builtin-prune.c
+2 -2
@@ -217,7 +217,7 @@ static void add_cache_refs(void)
217 add_cache_tree(active_cache_tree);
218 }
219
220 -int cmd_prune(int argc, const char **argv, char **envp)
220 +int cmd_prune(int argc, const char **argv, const char *prefix)
221 {
222 int i;
223
@@ -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, setup_git_directory());
237 + init_revisions(&revs, prefix);
238 revs.tag_objects = 1;
239 revs.blob_objects = 1;
240 revs.tree_objects = 1;
builtin-push.c
+1 -1
@@ -270,7 +270,7 @@ static int do_push(const char *repo)
270 return 0;
271 }
272
273 -int cmd_push(int argc, const char **argv, char **envp)
273 +int cmd_push(int argc, const char **argv, const char *prefix)
274 {
275 int i;
276 const char *repo = "origin"; /* default repository */
builtin-read-tree.c
+1 -2
@@ -870,7 +870,7 @@ static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--aggressive
870
871 static struct lock_file lock_file;
872
873 -int cmd_read_tree(int argc, const char **argv, char **envp)
873 +int cmd_read_tree(int argc, const char **argv, const char *prefix)
874 {
875 int i, newfd, stage = 0;
876 unsigned char sha1[20];
@@ -882,7 +882,6 @@ int cmd_read_tree(int argc, const char **argv, char **envp)
882 state.quiet = 1;
883 state.refresh_cache = 1;
884
885 - setup_git_directory();
885 git_config(git_default_config);
886
887 newfd = hold_lock_file_for_update(&lock_file, get_index_file());
builtin-rev-list.c
+2 -2
@@ -306,12 +306,12 @@ static void mark_edges_uninteresting(struct commit_list *list)
306 }
307 }
308
309 -int cmd_rev_list(int argc, const char **argv, char **envp)
309 +int cmd_rev_list(int argc, const char **argv, const char *prefix)
310 {
311 struct commit_list *list;
312 int i;
313
314 - init_revisions(&revs, setup_git_directory());
314 + init_revisions(&revs, prefix);
315 revs.abbrev = 0;
316 revs.commit_format = CMIT_FMT_UNSPECIFIED;
317 argc = setup_revisions(argc, argv, &revs, NULL);
builtin-rev-parse.c
+1 -2
@@ -209,11 +209,10 @@ static int try_difference(const char *arg)
209 return 0;
210 }
211
212 -int cmd_rev_parse(int argc, const char **argv, char **envp)
212 +int cmd_rev_parse(int argc, const char **argv, const char *prefix)
213 {
214 int i, as_is = 0, verify = 0;
215 unsigned char sha1[20];
216 - const char *prefix = setup_git_directory();
216
217 git_config(git_default_config);
218
builtin-rm.c
+1 -2
@@ -43,11 +43,10 @@ static int remove_file(const char *name)
43
44 static struct lock_file lock_file;
45
46 -int cmd_rm(int argc, const char **argv, char **envp)
46 +int cmd_rm(int argc, const char **argv, const char *prefix)
47 {
48 int i, newfd;
49 int verbose = 0, show_only = 0, force = 0;
50 - const char *prefix = setup_git_directory();
50 const char **pathspec;
51 char *seen;
52
builtin-show-branch.c
+1 -2
@@ -550,7 +550,7 @@ static int omit_in_dense(struct commit *commit, struct commit **rev, int n)
550 return 0;
551 }
552
553 -int cmd_show_branch(int ac, const char **av, char **envp)
553 +int cmd_show_branch(int ac, const char **av, const char *prefix)
554 {
555 struct commit *rev[MAX_REVS], *commit;
556 struct commit_list *list = NULL, *seen = NULL;
@@ -573,7 +573,6 @@ int cmd_show_branch(int ac, const char **av, char **envp)
573 int topics = 0;
574 int dense = 1;
575
576 - setup_git_directory();
576 git_config(git_show_branch_config);
577
578 /* If nothing is specified, try the default first */
builtin-stripspace.c
+1 -1
@@ -54,7 +54,7 @@ void stripspace(FILE *in, FILE *out)
54 fputc('\n', out);
55 }
56
57 -int cmd_stripspace(int argc, const char **argv, char **envp)
57 +int cmd_stripspace(int argc, const char **argv, const char *prefix)
58 {
59 stripspace(stdin, stdout);
60 return 0;
builtin-tar-tree.c
+4 -5
@@ -308,7 +308,7 @@ int git_tar_config(const char *var, const char *value)
308 return git_default_config(var, value);
309 }
310
311 -static int generate_tar(int argc, const char **argv, char** envp)
311 +static int generate_tar(int argc, const char **argv, const char *prefix)
312 {
313 unsigned char sha1[20], tree_sha1[20];
314 struct commit *commit;
@@ -319,7 +319,6 @@ static int generate_tar(int argc, const char **argv, char** envp)
319 current_path.alloc = PATH_MAX;
320 current_path.len = current_path.eof = 0;
321
322 - setup_git_directory();
322 git_config(git_tar_config);
323
324 switch (argc) {
@@ -402,19 +401,19 @@ static int remote_tar(int argc, const char **argv)
401 return !!ret;
402 }
403
405 -int cmd_tar_tree(int argc, const char **argv, char **envp)
404 +int cmd_tar_tree(int argc, const char **argv, const char *prefix)
405 {
406 if (argc < 2)
407 usage(tar_tree_usage);
408 if (!strncmp("--remote=", argv[1], 9))
409 return remote_tar(argc, argv);
411 - return generate_tar(argc, argv, envp);
410 + return generate_tar(argc, argv, prefix);
411 }
412
413 /* ustar header + extended global header content */
414 #define HEADERSIZE (2 * RECORDSIZE)
415
417 -int cmd_get_tar_commit_id(int argc, const char **argv, char **envp)
416 +int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix)
417 {
418 char buffer[HEADERSIZE];
419 struct ustar_header *header = (struct ustar_header *)buffer;
builtin-update-index.c
+1 -2
@@ -476,12 +476,11 @@ static int do_reupdate(int ac, const char **av,
476 return 0;
477 }
478
479 -int cmd_update_index(int argc, const char **argv, char **envp)
479 +int cmd_update_index(int argc, const char **argv, const char *prefix)
480 {
481 int i, newfd, entries, has_errors = 0, line_termination = '\n';
482 int allow_options = 1;
483 int read_from_stdin = 0;
484 - const char *prefix = setup_git_directory();
484 int prefix_length = prefix ? strlen(prefix) : 0;
485 char set_executable_bit = 0;
486 unsigned int refresh_flags = 0;
builtin-update-ref.c
+1 -2
@@ -5,7 +5,7 @@
5 static const char git_update_ref_usage[] =
6 "git-update-ref <refname> <value> [<oldval>] [-m <reason>]";
7
8 -int cmd_update_ref(int argc, const char **argv, char **envp)
8 +int cmd_update_ref(int argc, const char **argv, const char *prefix)
9 {
10 const char *refname=NULL, *value=NULL, *oldval=NULL, *msg=NULL;
11 struct ref_lock *lock;
@@ -13,7 +13,6 @@ int cmd_update_ref(int argc, const char **argv, char **envp)
13 int i;
14
15 setup_ident();
16 - setup_git_directory();
16 git_config(git_default_config);
17
18 for (i = 1; i < argc; i++) {
builtin-upload-tar.c
+1 -1
@@ -15,7 +15,7 @@ static int nak(const char *reason)
15 return 1;
16 }
17
18 -int cmd_upload_tar(int argc, const char **argv, char **envp)
18 +int cmd_upload_tar(int argc, const char **argv, const char *prefix)
19 {
20 int len;
21 const char *dir = argv[1];
builtin-write-tree.c
+1 -3
@@ -60,14 +60,12 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
60 return 0;
61 }
62
63 -int cmd_write_tree(int argc, const char **argv, char **envp)
63 +int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
64 {
65 int missing_ok = 0, ret;
66 const char *prefix = NULL;
67 unsigned char sha1[20];
68
69 - setup_git_directory();
70 -
69 while (1 < argc) {
70 const char *arg = argv[1];
71 if (!strcmp(arg, "--missing-ok"))
builtin.h
+38 -38
@@ -15,53 +15,53 @@ void cmd_usage(int show_all, const char *exec_path, const char *fmt, ...)
15 #endif
16 ;
17
18 -extern int cmd_help(int argc, const char **argv, char **envp);
19 -extern int cmd_version(int argc, const char **argv, char **envp);
18 +extern int cmd_help(int argc, const char **argv, const char *prefix);
19 +extern int cmd_version(int argc, const char **argv, const char *prefix);
20
21 -extern int cmd_whatchanged(int argc, const char **argv, char **envp);
22 -extern int cmd_show(int argc, const char **argv, char **envp);
23 -extern int cmd_log(int argc, const char **argv, char **envp);
24 -extern int cmd_diff(int argc, const char **argv, char **envp);
25 -extern int cmd_format_patch(int argc, const char **argv, char **envp);
26 -extern int cmd_count_objects(int argc, const char **argv, char **envp);
21 +extern int cmd_whatchanged(int argc, const char **argv, const char *prefix);
22 +extern int cmd_show(int argc, const char **argv, const char *prefix);
23 +extern int cmd_log(int argc, const char **argv, const char *prefix);
24 +extern int cmd_diff(int argc, const char **argv, const char *prefix);
25 +extern int cmd_format_patch(int argc, const char **argv, const char *prefix);
26 +extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
27
28 -extern int cmd_prune(int argc, const char **argv, char **envp);
28 +extern int cmd_prune(int argc, const char **argv, const char *prefix);
29
30 -extern int cmd_push(int argc, const char **argv, char **envp);
31 -extern int cmd_grep(int argc, const char **argv, char **envp);
32 -extern int cmd_rm(int argc, const char **argv, char **envp);
33 -extern int cmd_add(int argc, const char **argv, char **envp);
34 -extern int cmd_rev_list(int argc, const char **argv, char **envp);
35 -extern int cmd_check_ref_format(int argc, const char **argv, char **envp);
36 -extern int cmd_init_db(int argc, const char **argv, char **envp);
37 -extern int cmd_tar_tree(int argc, const char **argv, char **envp);
38 -extern int cmd_upload_tar(int argc, const char **argv, char **envp);
39 -extern int cmd_get_tar_commit_id(int argc, const char **argv, char **envp);
40 -extern int cmd_ls_files(int argc, const char **argv, char **envp);
41 -extern int cmd_ls_tree(int argc, const char **argv, char **envp);
42 -extern int cmd_read_tree(int argc, const char **argv, char **envp);
43 -extern int cmd_commit_tree(int argc, const char **argv, char **envp);
44 -extern int cmd_apply(int argc, const char **argv, char **envp);
45 -extern int cmd_show_branch(int argc, const char **argv, char **envp);
46 -extern int cmd_diff_files(int argc, const char **argv, char **envp);
47 -extern int cmd_diff_index(int argc, const char **argv, char **envp);
48 -extern int cmd_diff_stages(int argc, const char **argv, char **envp);
49 -extern int cmd_diff_tree(int argc, const char **argv, char **envp);
50 -extern int cmd_cat_file(int argc, const char **argv, char **envp);
51 -extern int cmd_rev_parse(int argc, const char **argv, char **envp);
52 -extern int cmd_update_index(int argc, const char **argv, char **envp);
53 -extern int cmd_update_ref(int argc, const char **argv, char **envp);
54 -extern int cmd_fmt_merge_msg(int argc, const char **argv, char **envp);
30 +extern int cmd_push(int argc, const char **argv, const char *prefix);
31 +extern int cmd_grep(int argc, const char **argv, const char *prefix);
32 +extern int cmd_rm(int argc, const char **argv, const char *prefix);
33 +extern int cmd_add(int argc, const char **argv, const char *prefix);
34 +extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
35 +extern int cmd_check_ref_format(int argc, const char **argv, const char *prefix);
36 +extern int cmd_init_db(int argc, const char **argv, const char *prefix);
37 +extern int cmd_tar_tree(int argc, const char **argv, const char *prefix);
38 +extern int cmd_upload_tar(int argc, const char **argv, const char *prefix);
39 +extern int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
40 +extern int cmd_ls_files(int argc, const char **argv, const char *prefix);
41 +extern int cmd_ls_tree(int argc, const char **argv, const char *prefix);
42 +extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
43 +extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
44 +extern int cmd_apply(int argc, const char **argv, const char *prefix);
45 +extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
46 +extern int cmd_diff_files(int argc, const char **argv, const char *prefix);
47 +extern int cmd_diff_index(int argc, const char **argv, const char *prefix);
48 +extern int cmd_diff_stages(int argc, const char **argv, const char *prefix);
49 +extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
50 +extern int cmd_cat_file(int argc, const char **argv, const char *prefix);
51 +extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
52 +extern int cmd_update_index(int argc, const char **argv, const char *prefix);
53 +extern int cmd_update_ref(int argc, const char **argv, const char *prefix);
54 +extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
55
56 -extern int cmd_write_tree(int argc, const char **argv, char **envp);
56 +extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
57 extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
58
59 -extern int cmd_mailsplit(int argc, const char **argv, char **envp);
59 +extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
60 extern int split_mbox(const char **mbox, const char *dir, int allow_bare, int nr_prec, int skip);
61
62 -extern int cmd_mailinfo(int argc, const char **argv, char **envp);
62 +extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
63 extern int mailinfo(FILE *in, FILE *out, int ks, const char *encoding, const char *msg, const char *patch);
64
65 -extern int cmd_stripspace(int argc, const char **argv, char **envp);
65 +extern int cmd_stripspace(int argc, const char **argv, const char *prefix);
66 extern void stripspace(FILE *in, FILE *out);
67 #endif
git.c
+35 -28
@@ -214,51 +214,54 @@ static int handle_alias(int *argcp, const char ***argv)
214
215 const char git_version_string[] = GIT_VERSION;
216
217 +#define NEEDS_PREFIX 1
218 +
219 static void handle_internal_command(int argc, const char **argv, char **envp)
220 {
221 const char *cmd = argv[0];
222 static struct cmd_struct {
223 const char *cmd;
222 - int (*fn)(int, const char **, char **);
224 + int (*fn)(int, const char **, const char *);
225 + int prefix;
226 } commands[] = {
227 { "version", cmd_version },
228 { "help", cmd_help },
226 - { "log", cmd_log },
227 - { "whatchanged", cmd_whatchanged },
228 - { "show", cmd_show },
229 + { "log", cmd_log, NEEDS_PREFIX },
230 + { "whatchanged", cmd_whatchanged, NEEDS_PREFIX },
231 + { "show", cmd_show, NEEDS_PREFIX },
232 { "push", cmd_push },
230 - { "format-patch", cmd_format_patch },
233 + { "format-patch", cmd_format_patch, NEEDS_PREFIX },
234 { "count-objects", cmd_count_objects },
232 - { "diff", cmd_diff },
233 - { "grep", cmd_grep },
234 - { "rm", cmd_rm },
235 - { "add", cmd_add },
236 - { "rev-list", cmd_rev_list },
235 + { "diff", cmd_diff, NEEDS_PREFIX },
236 + { "grep", cmd_grep, NEEDS_PREFIX },
237 + { "rm", cmd_rm, NEEDS_PREFIX },
238 + { "add", cmd_add, NEEDS_PREFIX },
239 + { "rev-list", cmd_rev_list, NEEDS_PREFIX },
240 { "init-db", cmd_init_db },
241 { "get-tar-commit-id", cmd_get_tar_commit_id },
242 { "upload-tar", cmd_upload_tar },
243 { "check-ref-format", cmd_check_ref_format },
241 - { "ls-files", cmd_ls_files },
242 - { "ls-tree", cmd_ls_tree },
243 - { "tar-tree", cmd_tar_tree },
244 - { "read-tree", cmd_read_tree },
245 - { "commit-tree", cmd_commit_tree },
244 + { "ls-files", cmd_ls_files, NEEDS_PREFIX },
245 + { "ls-tree", cmd_ls_tree, NEEDS_PREFIX },
246 + { "tar-tree", cmd_tar_tree, NEEDS_PREFIX },
247 + { "read-tree", cmd_read_tree, NEEDS_PREFIX },
248 + { "commit-tree", cmd_commit_tree, NEEDS_PREFIX },
249 { "apply", cmd_apply },
247 - { "show-branch", cmd_show_branch },
248 - { "diff-files", cmd_diff_files },
249 - { "diff-index", cmd_diff_index },
250 - { "diff-stages", cmd_diff_stages },
251 - { "diff-tree", cmd_diff_tree },
252 - { "cat-file", cmd_cat_file },
253 - { "rev-parse", cmd_rev_parse },
254 - { "write-tree", cmd_write_tree },
250 + { "show-branch", cmd_show_branch, NEEDS_PREFIX },
251 + { "diff-files", cmd_diff_files, NEEDS_PREFIX },
252 + { "diff-index", cmd_diff_index, NEEDS_PREFIX },
253 + { "diff-stages", cmd_diff_stages, NEEDS_PREFIX },
254 + { "diff-tree", cmd_diff_tree, NEEDS_PREFIX },
255 + { "cat-file", cmd_cat_file, NEEDS_PREFIX },
256 + { "rev-parse", cmd_rev_parse, NEEDS_PREFIX },
257 + { "write-tree", cmd_write_tree, NEEDS_PREFIX },
258 { "mailsplit", cmd_mailsplit },
259 { "mailinfo", cmd_mailinfo },
260 { "stripspace", cmd_stripspace },
258 - { "update-index", cmd_update_index },
259 - { "update-ref", cmd_update_ref },
260 - { "fmt-merge-msg", cmd_fmt_merge_msg },
261 - { "prune", cmd_prune },
261 + { "update-index", cmd_update_index, NEEDS_PREFIX },
262 + { "update-ref", cmd_update_ref, NEEDS_PREFIX },
263 + { "fmt-merge-msg", cmd_fmt_merge_msg, NEEDS_PREFIX },
264 + { "prune", cmd_prune, NEEDS_PREFIX },
265 };
266 int i;
267
@@ -270,9 +273,13 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
273
274 for (i = 0; i < ARRAY_SIZE(commands); i++) {
275 struct cmd_struct *p = commands+i;
276 + const char *prefix;
277 if (strcmp(p->cmd, cmd))
278 continue;
279
280 + prefix = NULL;
281 + if (p->prefix)
282 + prefix = setup_git_directory();
283 if (getenv("GIT_TRACE")) {
284 int i;
285 fprintf(stderr, "trace: built-in: git");
@@ -284,7 +291,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
291 fflush(stderr);
292 }
293
287 - exit(p->fn(argc, argv, envp));
294 + exit(p->fn(argc, argv, prefix));
295 }
296 }
297