vendor/libgit2/src/refs.h in rugged-1.0.1 vs vendor/libgit2/src/refs.h in rugged-1.1.0

- old
+ new

@@ -43,11 +43,10 @@ #define GIT_REBASE_MERGE_DIR "rebase-merge/" #define GIT_REBASE_MERGE_INTERACTIVE_FILE GIT_REBASE_MERGE_DIR "interactive" #define GIT_REBASE_APPLY_DIR "rebase-apply/" #define GIT_REBASE_APPLY_REBASING_FILE GIT_REBASE_APPLY_DIR "rebasing" #define GIT_REBASE_APPLY_APPLYING_FILE GIT_REBASE_APPLY_DIR "applying" -#define GIT_REFS_HEADS_MASTER_FILE GIT_REFS_HEADS_DIR "master" #define GIT_SEQUENCER_DIR "sequencer/" #define GIT_SEQUENCER_HEAD_FILE GIT_SEQUENCER_DIR "head" #define GIT_SEQUENCER_OPTIONS_FILE GIT_SEQUENCER_DIR "options" #define GIT_SEQUENCER_TODO_FILE GIT_SEQUENCER_DIR "todo" @@ -88,10 +87,11 @@ int git_reference__update_terminal(git_repository *repo, const char *ref_name, const git_oid *oid, const git_signature *sig, const char *log_message); int git_reference__is_valid_name(const char *refname, unsigned int flags); int git_reference__is_branch(const char *ref_name); int git_reference__is_remote(const char *ref_name); int git_reference__is_tag(const char *ref_name); +int git_reference__is_note(const char *ref_name); const char *git_reference__shorthand(const char *name); /** * Lookup a reference by name and try to resolve to an OID. * @@ -112,27 +112,9 @@ int git_reference_lookup_resolved( git_reference **reference_out, git_repository *repo, const char *name, int max_deref); - -/** - * Read reference from a file. - * - * This function will read in the file at `path`. If it is a - * symref, it will return a new unresolved symbolic reference - * with the given name pointing to the reference pointed to by - * the file. If it is not a symbolic reference, it will return - * the resolved reference. - * - * Note that because the refdb is not involved for symbolic references, they - * won't be owned, hence you should either not make the returned reference - * 'externally visible', or perform the lookup before returning it to the user. - */ -int git_reference__read_head( - git_reference **out, - git_repository *repo, - const char *path); int git_reference__log_signature(git_signature **out, git_repository *repo); /** Update a reference after a commit. */ int git_reference__update_for_commit(