mirror of
https://github.com/git/git.git
synced 2024-11-06 09:13:01 +01:00
0e5a7faa3a
This replaces the script "git-reset.sh" with "builtin-reset.c". A few git commands used in the script are called from the builtin also: "ls-files" to check for unmerged files, "read-tree" for resetting the index file in "mixed" and "hard" resets, and "update-index" to refresh at the end in the "mixed" reset and also for the option that gets selected paths into the index. The reset option with paths was implemented by Johannes Schindelin. Since the option that gets selected paths into the index is not a "reset" like the others because it does not change the HEAD at all, now the command is showing a warning when the "--mixed" option is supplied for that purpose. The following table shows the behaviour of "git reset" for the different supported options, where X means "changing" the HEAD, index or working tree: reset: --soft --mixed --hard -- <paths> HEAD X X X - index - X X X files - - X - Signed-off-by: Carlos Rica <jasampler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
89 lines
5.8 KiB
C
89 lines
5.8 KiB
C
#ifndef BUILTIN_H
|
|
#define BUILTIN_H
|
|
|
|
#include "git-compat-util.h"
|
|
|
|
extern const char git_version_string[];
|
|
extern const char git_usage_string[];
|
|
|
|
extern void help_unknown_cmd(const char *cmd);
|
|
extern size_t stripspace(char *buffer, size_t length, int skip_comments);
|
|
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
|
|
extern void prune_packed_objects(int);
|
|
|
|
extern int cmd_add(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_annotate(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_apply(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_archive(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_blame(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_branch(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_bundle(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_cat_file(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_checkout_index(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_check_attr(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_check_ref_format(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_cherry(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_cherry_pick(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_describe(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_diff_files(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_diff_index(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_diff(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_fetch__tool(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_format_patch(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_fsck(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_gc(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_grep(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_help(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_init_db(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_log(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_log_reflog(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_ls_files(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_ls_tree(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_mv(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_pickaxe(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_prune(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_push(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_reflog(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_config(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_rerere(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_reset(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_revert(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_rm(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_runstatus(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_shortlog(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_show(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_stripspace(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_tag(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_tar_tree(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_update_index(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_update_ref(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_upload_archive(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_upload_tar(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_verify_tag(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_version(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_whatchanged(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_verify_pack(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
|
|
|
|
#endif
|