diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2010-03-12 18:04:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-12 21:55:39 -0800 |
| commit | 894a9d333e9e2015cad00d95250b7c5d3acea8b6 (patch) | |
| tree | 2bab79483f959c7661e87ef70b1976ab9aa65bdb /refs.c | |
| parent | 6ceeaee7ea5bb754c76ce93c5b289f72d69fdb92 (diff) | |
| download | git-894a9d333e9e2015cad00d95250b7c5d3acea8b6.tar.gz | |
Support showing notes from more than one notes tree
With this patch, you can set notes.displayRef to a glob that points at
your favourite notes refs, e.g.,
[notes]
displayRef = refs/notes/*
Then git-log and friends will show notes from all trees.
Thanks to Junio C Hamano for lots of feedback, which greatly
influenced the design of the entire series and this commit in
particular.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.c')
| -rw-r--r-- | refs.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -695,7 +695,6 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern, { struct strbuf real_pattern = STRBUF_INIT; struct ref_filter filter; - const char *has_glob_specials; int ret; if (!prefix && prefixcmp(pattern, "refs/")) @@ -704,9 +703,8 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern, strbuf_addstr(&real_pattern, prefix); strbuf_addstr(&real_pattern, pattern); - has_glob_specials = strpbrk(pattern, "?*["); - if (!has_glob_specials) { - /* Append impiled '/' '*' if not present. */ + if (!has_glob_specials(pattern)) { + /* Append implied '/' '*' if not present. */ if (real_pattern.buf[real_pattern.len - 1] != '/') strbuf_addch(&real_pattern, '/'); /* No need to check for '*', there is none. */ |