65516f586b
When `log --decorate` is used, git will decorate commits with all
available refs. While in most cases this may give the desired effect,
under some conditions it can lead to excessively verbose output.
Introduce two command line options, `--decorate-refs=<pattern>` and
`--decorate-refs-exclude=<pattern>` to allow the user to select which
refs are used in decoration.
When "--decorate-refs=<pattern>" is given, only the refs that match the
pattern are used in decoration. The refs that match the pattern when
"--decorate-refs-exclude=<pattern>" is given, are never used in
decoration.
These options follow the same convention for mixing negative and
positive patterns across the system, assuming that the inclusive default
is to match all refs available.
(1) if there is no positive pattern given, pretend as if an
inclusive default positive pattern was given;
(2) for each candidate, reject it if it matches no positive
pattern, or if it matches any one of the negative patterns.
The rules for what is considered a match are slightly different from the
rules used elsewhere.
Commands like `log --glob` assume a trailing '/*' when glob chars are
not present in the pattern. This makes it difficult to specify a single
ref. On the other hand, commands like `describe --match --all` allow
specifying exact refs, but do not have the convenience of allowing
"shorthand refs" like 'refs/heads' or 'heads' to refer to
'refs/heads/*'.
The commands introduced in this patch consider a match if:
(a) the pattern contains globs chars,
and regular pattern matching returns a match.
(b) the pattern does not contain glob chars,
and ref '<pattern>' exists, or if ref exists under '<pattern>/'
This allows both behaviours (allowing single refs and shorthand refs)
yet remaining compatible with existent commands.
Helped-by: Kevin Daudt <me@ikke.info>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Rafael Ascensão <rafa.almas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
39 lines
1.4 KiB
C
39 lines
1.4 KiB
C
#ifndef LOG_TREE_H
|
|
#define LOG_TREE_H
|
|
|
|
#include "revision.h"
|
|
|
|
struct log_info {
|
|
struct commit *commit, *parent;
|
|
};
|
|
|
|
struct decoration_filter {
|
|
struct string_list *include_ref_pattern, *exclude_ref_pattern;
|
|
};
|
|
|
|
int parse_decorate_color_config(const char *var, const char *slot_name, const char *value);
|
|
void init_log_tree_opt(struct rev_info *);
|
|
int log_tree_diff_flush(struct rev_info *);
|
|
int log_tree_commit(struct rev_info *, struct commit *);
|
|
int log_tree_opt_parse(struct rev_info *, const char **, int);
|
|
void show_log(struct rev_info *opt);
|
|
void format_decorations_extended(struct strbuf *sb, const struct commit *commit,
|
|
int use_color,
|
|
const char *prefix,
|
|
const char *separator,
|
|
const char *suffix);
|
|
#define format_decorations(strbuf, commit, color) \
|
|
format_decorations_extended((strbuf), (commit), (color), " (", ", ", ")")
|
|
void show_decorations(struct rev_info *opt, struct commit *commit);
|
|
void log_write_email_headers(struct rev_info *opt, struct commit *commit,
|
|
const char **extra_headers_p,
|
|
int *need_8bit_cte_p);
|
|
void load_ref_decorations(struct decoration_filter *filter, int flags);
|
|
|
|
#define FORMAT_PATCH_NAME_MAX 64
|
|
void fmt_output_commit(struct strbuf *, struct commit *, struct rev_info *);
|
|
void fmt_output_subject(struct strbuf *, const char *subject, struct rev_info *);
|
|
void fmt_output_email_subject(struct strbuf *, struct rev_info *);
|
|
|
|
#endif
|