mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
5f02274e4c
Reimplement 'git pull' in C. * pt/pull-builtin: pull: remove redirection to git-pull.sh pull --rebase: error on no merge candidate cases pull --rebase: exit early when the working directory is dirty pull: configure --rebase via branch.<name>.rebase or pull.rebase pull: teach git pull about --rebase pull: set reflog message pull: implement pulling into an unborn branch pull: fast-forward working tree if head is updated pull: check if in unresolved merge state pull: support pull.ff config pull: error on no merge candidates pull: pass git-fetch's options to git-fetch pull: pass git-merge's options to git-merge pull: pass verbosity, --progress flags to fetch and merge pull: implement fetch + merge pull: implement skeletal builtin pull argv-array: implement argv_array_pushv() parse-options-cb: implement parse_opt_passthru_argv() parse-options-cb: implement parse_opt_passthru()
144 lines
8.8 KiB
C
144 lines
8.8 KiB
C
#ifndef BUILTIN_H
|
|
#define BUILTIN_H
|
|
|
|
#include "git-compat-util.h"
|
|
#include "strbuf.h"
|
|
#include "cache.h"
|
|
#include "commit.h"
|
|
|
|
#define DEFAULT_MERGE_LOG_LEN 20
|
|
|
|
extern const char git_usage_string[];
|
|
extern const char git_more_info_string[];
|
|
|
|
#define PRUNE_PACKED_DRY_RUN 01
|
|
#define PRUNE_PACKED_VERBOSE 02
|
|
|
|
extern void prune_packed_objects(int);
|
|
|
|
struct fmt_merge_msg_opts {
|
|
unsigned add_title:1,
|
|
credit_people:1;
|
|
int shortlog_len;
|
|
};
|
|
|
|
extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
|
|
struct fmt_merge_msg_opts *);
|
|
|
|
extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, int sha1_valid, char **buf, unsigned long *buf_size);
|
|
|
|
extern int is_builtin(const char *s);
|
|
|
|
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_bisect__helper(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(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_ignore(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_check_mailmap(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_clone(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_clean(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_column(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_commit(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_config(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_credential(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_fast_export(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_fetch(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_fetch_pack(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_hash_object(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_help(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_index_pack(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_init_db(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_interpret_trailers(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_ls_remote(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(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_index(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_merge_ours(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_merge_recursive(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_merge_tree(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_mktag(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_mktree(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_notes(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_pack_redundant(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_patch_id(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_pull(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_receive_pack(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_reflog(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_remote(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_remote_ext(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_remote_fd(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_repack(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_send_pack(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_status(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_file(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_update_server_info(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_archive_writer(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_var(int argc, const char **argv, const char *prefix);
|
|
extern int cmd_verify_commit(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_worktree(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);
|
|
extern int cmd_replace(int argc, const char **argv, const char *prefix);
|
|
|
|
#endif
|