Skip to content

Commit 7d5c884

Browse files
committed
Merge branch 'nd/sorted-builtin-command-list'
* nd/sorted-builtin-command-list: git.c: reorder builtin command list
2 parents 11e4b4f + ef5dd8a commit 7d5c884

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

git.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ static void handle_internal_command(int argc, const char **argv)
313313
const char *cmd = argv[0];
314314
static struct cmd_struct commands[] = {
315315
{ "add", cmd_add, RUN_SETUP | NEED_WORK_TREE },
316-
{ "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE },
317316
{ "annotate", cmd_annotate, RUN_SETUP },
318317
{ "apply", cmd_apply, RUN_SETUP_GENTLY },
319318
{ "archive", cmd_archive },
@@ -322,15 +321,15 @@ static void handle_internal_command(int argc, const char **argv)
322321
{ "branch", cmd_branch, RUN_SETUP },
323322
{ "bundle", cmd_bundle, RUN_SETUP_GENTLY },
324323
{ "cat-file", cmd_cat_file, RUN_SETUP },
324+
{ "check-attr", cmd_check_attr, RUN_SETUP },
325+
{ "check-ref-format", cmd_check_ref_format },
325326
{ "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE },
326327
{ "checkout-index", cmd_checkout_index,
327328
RUN_SETUP | NEED_WORK_TREE},
328-
{ "check-ref-format", cmd_check_ref_format },
329-
{ "check-attr", cmd_check_attr, RUN_SETUP },
330329
{ "cherry", cmd_cherry, RUN_SETUP },
331330
{ "cherry-pick", cmd_cherry_pick, RUN_SETUP | NEED_WORK_TREE },
332-
{ "clone", cmd_clone },
333331
{ "clean", cmd_clean, RUN_SETUP | NEED_WORK_TREE },
332+
{ "clone", cmd_clone },
334333
{ "commit", cmd_commit, RUN_SETUP | NEED_WORK_TREE },
335334
{ "commit-tree", cmd_commit_tree, RUN_SETUP },
336335
{ "config", cmd_config, RUN_SETUP_GENTLY },
@@ -358,8 +357,8 @@ static void handle_internal_command(int argc, const char **argv)
358357
{ "init-db", cmd_init_db },
359358
{ "log", cmd_log, RUN_SETUP },
360359
{ "ls-files", cmd_ls_files, RUN_SETUP },
361-
{ "ls-tree", cmd_ls_tree, RUN_SETUP },
362360
{ "ls-remote", cmd_ls_remote, RUN_SETUP_GENTLY },
361+
{ "ls-tree", cmd_ls_tree, RUN_SETUP },
363362
{ "mailinfo", cmd_mailinfo },
364363
{ "mailsplit", cmd_mailsplit },
365364
{ "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
@@ -379,6 +378,7 @@ static void handle_internal_command(int argc, const char **argv)
379378
{ "notes", cmd_notes, RUN_SETUP },
380379
{ "pack-objects", cmd_pack_objects, RUN_SETUP },
381380
{ "pack-redundant", cmd_pack_redundant, RUN_SETUP },
381+
{ "pack-refs", cmd_pack_refs, RUN_SETUP },
382382
{ "patch-id", cmd_patch_id },
383383
{ "peek-remote", cmd_ls_remote, RUN_SETUP_GENTLY },
384384
{ "pickaxe", cmd_blame, RUN_SETUP },
@@ -401,8 +401,10 @@ static void handle_internal_command(int argc, const char **argv)
401401
{ "rm", cmd_rm, RUN_SETUP },
402402
{ "send-pack", cmd_send_pack, RUN_SETUP },
403403
{ "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },
404-
{ "show-branch", cmd_show_branch, RUN_SETUP },
405404
{ "show", cmd_show, RUN_SETUP },
405+
{ "show-branch", cmd_show_branch, RUN_SETUP },
406+
{ "show-ref", cmd_show_ref, RUN_SETUP },
407+
{ "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE },
406408
{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
407409
{ "stripspace", cmd_stripspace },
408410
{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
@@ -415,13 +417,11 @@ static void handle_internal_command(int argc, const char **argv)
415417
{ "update-server-info", cmd_update_server_info, RUN_SETUP },
416418
{ "upload-archive", cmd_upload_archive },
417419
{ "var", cmd_var, RUN_SETUP_GENTLY },
420+
{ "verify-pack", cmd_verify_pack },
418421
{ "verify-tag", cmd_verify_tag, RUN_SETUP },
419422
{ "version", cmd_version },
420423
{ "whatchanged", cmd_whatchanged, RUN_SETUP },
421424
{ "write-tree", cmd_write_tree, RUN_SETUP },
422-
{ "verify-pack", cmd_verify_pack },
423-
{ "show-ref", cmd_show_ref, RUN_SETUP },
424-
{ "pack-refs", cmd_pack_refs, RUN_SETUP },
425425
};
426426
int i;
427427
static const char ext[] = STRIP_EXTENSION;

0 commit comments

Comments
 (0)