Merge branch 'rs/pretty-describe'

"git log --format='...'" learned "%(describe)" placeholder.

* rs/pretty-describe:
  archive: expand only a single %(describe) per archive
  pretty: document multiple %(describe) being inconsistent
  t4205: assert %(describe) test coverage
  pretty: add merge and exclude options to %(describe)
  pretty: add %(describe)
This commit is contained in:
Junio C Hamano
2021-03-22 14:00:24 -07:00
8 changed files with 145 additions and 7 deletions

View File

@@ -24,6 +24,10 @@ enum cmit_fmt {
CMIT_FMT_UNSPECIFIED
};
struct pretty_print_describe_status {
unsigned int max_invocations;
};
struct pretty_print_context {
/*
* Callers should tweak these to change the behavior of pp_* functions.
@@ -45,6 +49,7 @@ struct pretty_print_context {
int color;
struct ident_split *from_ident;
unsigned encode_email_headers:1;
struct pretty_print_describe_status *describe_status;
/*
* Fields below here are manipulated internally by pp_* functions and