aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-28 15:00:27 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-28 15:00:27 -0800
commit8712b3cdb0495f5a56b91cd67e2697412447a886 (patch)
tree98dafb9b4f38617d73ef59c9085e01ee727af729 /cache.h
parentcd956c73a2cce6613a6cd19df6ccb9ff1b08f79a (diff)
parent73ff1a131b340633b2ec2a0e68490de721448f56 (diff)
downloadgit-8712b3cdb0495f5a56b91cd67e2697412447a886.tar.gz
git-8712b3cdb0495f5a56b91cd67e2697412447a886.tar.xz
Merge branch 'tr/previous-branch'
* tr/previous-branch: t1505: remove debugging cruft Simplify parsing branch switching events in reflog Introduce for_each_recent_reflog_ent(). interpret_nth_last_branch(): plug small memleak Fix reflog parsing for a malformed branch switching entry Fix parsing of @{-1}@{1} interpret_nth_last_branch(): avoid traversing the reflog twice checkout: implement "-" abbreviation, add docs and tests sha1_name: support @{-N} syntax in get_sha1() sha1_name: tweak @{-N} lookup checkout: implement "@{-N}" shortcut name for N-th last branch Conflicts: sha1_name.c
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index c17fbf58a..45e713e92 100644
--- a/cache.h
+++ b/cache.h
@@ -667,6 +667,7 @@ extern int read_ref(const char *filename, unsigned char *sha1);
extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *);
extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
+extern int interpret_nth_last_branch(const char *str, struct strbuf *);
extern int refname_match(const char *abbrev_name, const char *full_name, const char **rules);
extern const char *ref_rev_parse_rules[];