Thanks. Will replace, with the attached stylistic fixes squashed in for minor issues that were spotted by my mechanical pre-acceptance filter. ref-filter.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git b/ref-filter.c a/ref-filter.c index a68ed7b147..a9d2c6a89d 100644 --- b/ref-filter.c +++ a/ref-filter.c @@ -76,7 +76,7 @@ static struct used_atom { struct { enum { RR_REF, RR_TRACK, RR_TRACKSHORT } option; struct refname_atom refname; - unsigned int nobracket: 1; + unsigned int nobracket : 1; } remote_ref; struct { enum { C_BARE, C_BODY, C_BODY_DEP, C_LINES, C_SIG, C_SUB } option; @@ -559,7 +559,7 @@ static void then_atom_handler(struct atom_value *atomv, struct ref_formatting_st if (if_then_else->cmp_status == COMPARE_EQUAL) { if (!strcmp(if_then_else->str, cur->output.buf)) if_then_else->condition_satisfied = 1; - } else if (if_then_else->cmp_status == COMPARE_UNEQUAL) { + } else if (if_then_else->cmp_status == COMPARE_UNEQUAL) { if (strcmp(if_then_else->str, cur->output.buf)) if_then_else->condition_satisfied = 1; } else if (cur->output.len && !is_empty(cur->output.buf)) @@ -1106,7 +1106,8 @@ static const char *lstrip_ref_components(const char *refname, int len) const char *p = refname; /* Find total no of '/' separated path-components */ - for (i = 0; p[i]; p[i] == '/' ? i++ : *p++); + for (i = 0; p[i]; p[i] == '/' ? i++ : *p++) + ; /* * The number of components we need to strip is now * the total minus the components to be left (Plus one @@ -1140,7 +1141,8 @@ static const char *rstrip_ref_components(const char *refname, int len) const char *p = refname; /* Find total no of '/' separated path-components */ - for (i = 0; p[i]; p[i] == '/' ? i++ : *p++); + for (i = 0; p[i]; p[i] == '/' ? i++ : *p++) + ; /* * The number of components we need to strip is now * the total minus the components to be left (Plus one