[PATCH 0/2] ui-log: Don't print out unknown decoration types

[PATCH 0/2] ui-log: Don't print out unknown decoration types

[tim.nordell]

On our server we have some ref spaces that shouldn't be displayed in
the main log.  The command line tool "git log" does not display these
either.  Add some additional smarts to ui-log so that it uses the
enumeration types returned by the internals of git to determine
whether or not to display a tag, as well as converting the logic
in the log to use these enumerations rather than reinventing the
wheel for these.

Tim Nordell (2):
  ui-log: Do not always emit decoration span
  ui-log: Simplify decoration code

 ui-log.c | 58 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)
-- 
2.4.9

[PATCH 1/2] ui-log: Do not always emit decoration span

[tim.nordell]

The decoration span does not need to be emited if there aren't
any decorations to show.  This modification saves slightly
on bandwidth.

Signed-off-by: Tim Nordell <tim.nordell at logicpd.com>

diff --git a/ui-log.c b/ui-log.c
index 0a3938b..62881ce 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -61,6 +61,8 @@ void show_commit_decorations(struct commit *commit)
 
 	buf[sizeof(buf) - 1] = 0;
 	deco = get_name_decoration(&commit->object);
+	if(!deco)
+		return;
 	html("<span class='decoration'>");
 	while (deco) {
 		if (starts_with(deco->name, "refs/heads/")) {
-- 
2.4.9

[PATCH 1/2] ui-log: Do not always emit decoration span

[john]

On Fri, Feb 26, 2016 at 02:57:30PM -0600, Tim Nordell wrote:
> The decoration span does not need to be emited if there aren't
> any decorations to show.  This modification saves slightly
> on bandwidth.
> 
> Signed-off-by: Tim Nordell <tim.nordell at logicpd.com>
> 
> diff --git a/ui-log.c b/ui-log.c
> index 0a3938b..62881ce 100644
> --- a/ui-log.c
> +++ b/ui-log.c
> @@ -61,6 +61,8 @@ void show_commit_decorations(struct commit *commit)
>  
>  	buf[sizeof(buf) - 1] = 0;
>  	deco = get_name_decoration(&commit->object);
> +	if(!deco)

style nit: if (!deco)

otherwise:

Reviewed-by: John Keeping <john at keeping.me.uk>

> +		return;
>  	html("<span class='decoration'>");
>  	while (deco) {
>  		if (starts_with(deco->name, "refs/heads/")) {
> -- 
> 2.4.9
> 
> _______________________________________________
> CGit mailing list
> CGit at lists.zx2c4.com
> http://lists.zx2c4.com/mailman/listinfo/cgit

[PATCH 1/2] ui-log: Do not always emit decoration span

[Jason]

Merged, thanks.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20160512/92da2b83/attachment.html>