summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-18 01:55:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-18 01:55:06 (GMT)
commitca8a36e6e0cf6ee952df16160bc853630c56b997 (patch)
treea7a0cc36a4aac48173264e8d84dbe4ba1dcd7fad /cache.h
parenta57ca9dd400c8459a3cd3d769bab317f57d1e9ac (diff)
parent8321c56b6bae25a2d70790f452df894be536b32c (diff)
downloadgit-ca8a36e6e0cf6ee952df16160bc853630c56b997.zip
git-ca8a36e6e0cf6ee952df16160bc853630c56b997.tar.gz
git-ca8a36e6e0cf6ee952df16160bc853630c56b997.tar.bz2
Merge branch 'js/remote-improvements'
* js/remote-improvements: (23 commits) builtin-remote.c: no "commented out" code, please builtin-remote: new show output style for push refspecs builtin-remote: new show output style remote: make guess_remote_head() use exact HEAD lookup if it is available builtin-remote: add set-head subcommand builtin-remote: teach show to display remote HEAD builtin-remote: fix two inconsistencies in the output of "show <remote>" builtin-remote: make get_remote_ref_states() always populate states.tracked builtin-remote: rename variables and eliminate redundant function call builtin-remote: remove unused code in get_ref_states builtin-remote: refactor duplicated cleanup code string-list: new for_each_string_list() function remote: make match_refs() not short-circuit remote: make match_refs() copy src ref before assigning to peer_ref remote: let guess_remote_head() optionally return all matches remote: make copy_ref() perform a deep copy remote: simplify guess_remote_head() move locate_head() to remote.c move duplicated ref_newer() to remote.c move duplicated get_local_heads() to remote.c ... Conflicts: builtin-clone.c
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index bd4c390..39789ee 100644
--- a/cache.h
+++ b/cache.h
@@ -805,7 +805,7 @@ struct ref {
#define REF_HEADS (1u << 1)
#define REF_TAGS (1u << 2)
-extern struct ref *find_ref_by_name(struct ref *list, const char *name);
+extern struct ref *find_ref_by_name(const struct ref *list, const char *name);
#define CONNECT_VERBOSE (1u << 0)
extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);