Skip to content
Permalink
Browse files

Merge pull request #2428 from dscho/sync-with-upstream

Update ROGERSM94/fix-rebase to the version that made it upstream
  • Loading branch information
dscho committed Dec 13, 2019
2 parents 992f077 + af711cd commit b5deb24d740a272cc792a529d10f9dc09a00dd4f
Showing with 45 additions and 37 deletions.
  1. +45 −37 sequencer.c
@@ -4425,7 +4425,6 @@ static const char *label_oid(struct object_id *oid, const char *label,
struct labels_entry *labels_entry;
struct string_entry *string_entry;
struct object_id dummy;
size_t len;
int i;

string_entry = oidmap_get(&state->commit2label, oid);
@@ -4445,10 +4444,10 @@ static const char *label_oid(struct object_id *oid, const char *label,
* abbreviation for any uninteresting commit's names that does not
* clash with any other label.
*/
strbuf_reset(&state->buf);
if (!label) {
char *p;

strbuf_reset(&state->buf);
strbuf_grow(&state->buf, GIT_MAX_HEXSZ);
label = p = state->buf.buf;

@@ -4471,32 +4470,55 @@ static const char *label_oid(struct object_id *oid, const char *label,
p[i] = save;
}
}
} else if (((len = strlen(label)) == the_hash_algo->hexsz &&
!get_oid_hex(label, &dummy)) ||
(len == 1 && *label == '#') ||
hashmap_get_from_hash(&state->labels,
strihash(label), label)) {
} else {
struct strbuf *buf = &state->buf;

/*
* If the label already exists, or if the label is a valid full
* OID, or the label is a '#' (which we use as a separator
* between merge heads and oneline), we append a dash and a
* number to make it unique.
* Sanitize labels by replacing non-alpha-numeric characters
* (including white-space ones) by dashes, as they might be
* illegal in file names (and hence in ref names).
*
* Note that we retain non-ASCII UTF-8 characters (identified
* via the most significant bit). They should be all acceptable
* in file names. We do not validate the UTF-8 here, that's not
* the job of this function.
*/
struct strbuf *buf = &state->buf;
for (; *label; label++)
if ((*label & 0x80) || isalnum(*label))
strbuf_addch(buf, *label);
/* avoid leading dash and double-dashes */
else if (buf->len && buf->buf[buf->len - 1] != '-')
strbuf_addch(buf, '-');
if (!buf->len) {
strbuf_addstr(buf, "rev-");
strbuf_add_unique_abbrev(buf, oid, default_abbrev);
}
label = buf->buf;

strbuf_reset(buf);
strbuf_add(buf, label, len);
if ((buf->len == the_hash_algo->hexsz &&
!get_oid_hex(label, &dummy)) ||
(buf->len == 1 && *label == '#') ||
hashmap_get_from_hash(&state->labels,
strihash(label), label)) {
/*
* If the label already exists, or if the label is a
* valid full OID, or the label is a '#' (which we use
* as a separator between merge heads and oneline), we
* append a dash and a number to make it unique.
*/
size_t len = buf->len;

for (i = 2; ; i++) {
strbuf_setlen(buf, len);
strbuf_addf(buf, "-%d", i);
if (!hashmap_get_from_hash(&state->labels,
strihash(buf->buf),
buf->buf))
break;
}
for (i = 2; ; i++) {
strbuf_setlen(buf, len);
strbuf_addf(buf, "-%d", i);
if (!hashmap_get_from_hash(&state->labels,
strihash(buf->buf),
buf->buf))
break;
}

label = buf->buf;
label = buf->buf;
}
}

FLEX_ALLOC_STR(labels_entry, label, label);
@@ -4598,20 +4620,6 @@ static int make_script_with_merges(struct pretty_print_context *pp,
else
strbuf_addbuf(&label, &oneline);

/*
* Sanitize labels by replacing non-alpha-numeric characters
* (including white-space ones) by dashes, as they might be
* illegal in file names (and hence in ref names).
*
* Note that we retain non-ASCII UTF-8 characters (identified
* via the most significant bit). They should be all acceptable
* in file names. We do not validate the UTF-8 here, that's not
* the job of this function.
*/
for (p1 = label.buf; *p1; p1++)
if (!(*p1 & 0x80) && !isalnum(*p1))
*(char *)p1 = '-';

strbuf_reset(&buf);
strbuf_addf(&buf, "%s -C %s",
cmd_merge, oid_to_hex(&commit->object.oid));

0 comments on commit b5deb24

Please sign in to comment.
You can’t perform that action at this time.