git.c: Rename NEEDS_PREFIX to RUN_SETUP
As Matthias Kestenholz noted, the flag does not quite mean "needs prefix" -- it is more like "run setup_git_directory() before running this command", so rename it to avoid future confusion. While we are at it, rewrite the definition of options to make it obvious that we are talking about flag bits by using standard (1<<n) notation. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Aug 4, 2006 at 02:04 UTC
efffea033457eedb90ad63596687564f797f12de
1 file changed
+36
-36
git.c
+36
-36
@@ -213,8 +213,8 @@ static int handle_alias(int *argcp, const char ***argv)
213
214
const char git_version_string[] = GIT_VERSION;
215
216
-#define NEEDS_PREFIX 1
217
-#define USE_PAGER 2
216
+#define RUN_SETUP (1<<0)
217
+#define USE_PAGER (1<<1)
218
219
static void handle_internal_command(int argc, const char **argv, char **envp)
220
{
@@ -224,52 +224,52 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
224
int (*fn)(int, const char **, const char *);
225
int option;
226
} commands[] = {
227
- { "add", cmd_add, NEEDS_PREFIX },
227
+ { "add", cmd_add, RUN_SETUP },
228
{ "apply", cmd_apply },
229
- { "cat-file", cmd_cat_file, NEEDS_PREFIX },
230
- { "checkout-index", cmd_checkout_index, NEEDS_PREFIX },
229
+ { "cat-file", cmd_cat_file, RUN_SETUP },
230
+ { "checkout-index", cmd_checkout_index, RUN_SETUP },
231
{ "check-ref-format", cmd_check_ref_format },
232
- { "commit-tree", cmd_commit_tree, NEEDS_PREFIX },
232
+ { "commit-tree", cmd_commit_tree, RUN_SETUP },
233
{ "count-objects", cmd_count_objects },
234
- { "diff", cmd_diff, NEEDS_PREFIX },
235
- { "diff-files", cmd_diff_files, NEEDS_PREFIX },
236
- { "diff-index", cmd_diff_index, NEEDS_PREFIX },
237
- { "diff-stages", cmd_diff_stages, NEEDS_PREFIX },
238
- { "diff-tree", cmd_diff_tree, NEEDS_PREFIX },
239
- { "fmt-merge-msg", cmd_fmt_merge_msg, NEEDS_PREFIX },
240
- { "format-patch", cmd_format_patch, NEEDS_PREFIX },
234
+ { "diff", cmd_diff, RUN_SETUP },
235
+ { "diff-files", cmd_diff_files, RUN_SETUP },
236
+ { "diff-index", cmd_diff_index, RUN_SETUP },
237
+ { "diff-stages", cmd_diff_stages, RUN_SETUP },
238
+ { "diff-tree", cmd_diff_tree, RUN_SETUP },
239
+ { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
240
+ { "format-patch", cmd_format_patch, RUN_SETUP },
241
{ "get-tar-commit-id", cmd_get_tar_commit_id },
242
- { "grep", cmd_grep, NEEDS_PREFIX },
242
+ { "grep", cmd_grep, RUN_SETUP },
243
{ "help", cmd_help },
244
{ "init-db", cmd_init_db },
245
- { "log", cmd_log, NEEDS_PREFIX | USE_PAGER },
246
- { "ls-files", cmd_ls_files, NEEDS_PREFIX },
247
- { "ls-tree", cmd_ls_tree, NEEDS_PREFIX },
245
+ { "log", cmd_log, RUN_SETUP | USE_PAGER },
246
+ { "ls-files", cmd_ls_files, RUN_SETUP },
247
+ { "ls-tree", cmd_ls_tree, RUN_SETUP },
248
{ "mailinfo", cmd_mailinfo },
249
{ "mailsplit", cmd_mailsplit },
250
- { "mv", cmd_mv, NEEDS_PREFIX },
251
- { "name-rev", cmd_name_rev, NEEDS_PREFIX },
252
- { "pack-objects", cmd_pack_objects, NEEDS_PREFIX },
253
- { "prune", cmd_prune, NEEDS_PREFIX },
254
- { "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
250
+ { "mv", cmd_mv, RUN_SETUP },
251
+ { "name-rev", cmd_name_rev, RUN_SETUP },
252
+ { "pack-objects", cmd_pack_objects, RUN_SETUP },
253
+ { "prune", cmd_prune, RUN_SETUP },
254
+ { "prune-packed", cmd_prune_packed, RUN_SETUP },
255
{ "push", cmd_push },
256
- { "read-tree", cmd_read_tree, NEEDS_PREFIX },
256
+ { "read-tree", cmd_read_tree, RUN_SETUP },
257
{ "repo-config", cmd_repo_config },
258
- { "rev-list", cmd_rev_list, NEEDS_PREFIX },
259
- { "rev-parse", cmd_rev_parse, NEEDS_PREFIX },
260
- { "rm", cmd_rm, NEEDS_PREFIX },
261
- { "show-branch", cmd_show_branch, NEEDS_PREFIX },
262
- { "show", cmd_show, NEEDS_PREFIX | USE_PAGER },
258
+ { "rev-list", cmd_rev_list, RUN_SETUP },
259
+ { "rev-parse", cmd_rev_parse, RUN_SETUP },
260
+ { "rm", cmd_rm, RUN_SETUP },
261
+ { "show-branch", cmd_show_branch, RUN_SETUP },
262
+ { "show", cmd_show, RUN_SETUP | USE_PAGER },
263
{ "stripspace", cmd_stripspace },
264
- { "symbolic-ref", cmd_symbolic_ref, NEEDS_PREFIX },
265
- { "tar-tree", cmd_tar_tree, NEEDS_PREFIX },
266
- { "unpack-objects", cmd_unpack_objects, NEEDS_PREFIX },
267
- { "update-index", cmd_update_index, NEEDS_PREFIX },
268
- { "update-ref", cmd_update_ref, NEEDS_PREFIX },
264
+ { "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
265
+ { "tar-tree", cmd_tar_tree, RUN_SETUP },
266
+ { "unpack-objects", cmd_unpack_objects, RUN_SETUP },
267
+ { "update-index", cmd_update_index, RUN_SETUP },
268
+ { "update-ref", cmd_update_ref, RUN_SETUP },
269
{ "upload-tar", cmd_upload_tar },
270
{ "version", cmd_version },
271
- { "whatchanged", cmd_whatchanged, NEEDS_PREFIX | USE_PAGER },
272
- { "write-tree", cmd_write_tree, NEEDS_PREFIX },
271
+ { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
272
+ { "write-tree", cmd_write_tree, RUN_SETUP },
273
};
274
int i;
275
@@ -286,7 +286,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
286
continue;
287
288
prefix = NULL;
289
- if (p->option & NEEDS_PREFIX)
289
+ if (p->option & RUN_SETUP)
290
prefix = setup_git_directory();
291
if (p->option & USE_PAGER)
292
setup_pager();