diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-28 15:00:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-28 15:00:27 -0800 |
| commit | 8712b3cdb0495f5a56b91cd67e2697412447a886 (patch) | |
| tree | 98dafb9b4f38617d73ef59c9085e01ee727af729 /refs.h | |
| parent | cd956c73a2cce6613a6cd19df6ccb9ff1b08f79a (diff) | |
| parent | 73ff1a131b340633b2ec2a0e68490de721448f56 (diff) | |
| download | git-8712b3cdb0495f5a56b91cd67e2697412447a886.tar.gz | |
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 'refs.h')
| -rw-r--r-- | refs.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -60,6 +60,7 @@ extern int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned /* iterate over reflog entries */ typedef int each_reflog_ent_fn(unsigned char *osha1, unsigned char *nsha1, const char *, unsigned long, int, const char *, void *); int for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data); +int for_each_recent_reflog_ent(const char *ref, each_reflog_ent_fn fn, long, void *cb_data); /* * Calls the specified function for each reflog file until it returns nonzero, |