kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'bw/fetch-pack-i18n' 

i18n updates.

* bw/fetch-pack-i18n:
  fetch-pack: mark die strings for translation
maint
Junio C Hamano 2018-08-15 15:08:20 -07:00
parent 1638a625ca bbb19a8b06
commit ea30f539ef
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fetch-pack.c
View File

@ -1185,13 +1185,13 @@ static int process_section_header(struct packet_reader *reader,
int ret; int ret;


if (packet_reader_peek(reader) != PACKET_READ_NORMAL) if (packet_reader_peek(reader) != PACKET_READ_NORMAL)
die("error reading section header '%s'", section); die(_("error reading section header '%s'"), section);


ret = !strcmp(reader->line, section); ret = !strcmp(reader->line, section);


if (!peek) { if (!peek) {
if (!ret) if (!ret)
die("expected '%s', received '%s'", die(_("expected '%s', received '%s'"),
section, reader->line); section, reader->line);
packet_reader_read(reader); packet_reader_read(reader);
} }
@ -1230,12 +1230,12 @@ static int process_acks(struct fetch_negotiator *negotiator,
continue; continue;
} }


die("unexpected acknowledgment line: '%s'", reader->line); die(_("unexpected acknowledgment line: '%s'"), reader->line);
} }


if (reader->status != PACKET_READ_FLUSH && if (reader->status != PACKET_READ_FLUSH &&
reader->status != PACKET_READ_DELIM) reader->status != PACKET_READ_DELIM)
die("error processing acks: %d", reader->status); die(_("error processing acks: %d"), reader->status);


/* return 0 if no common, 1 if there are common, or 2 if ready */ /* return 0 if no common, 1 if there are common, or 2 if ready */
return received_ready ? 2 : (received_ack ? 1 : 0); return received_ready ? 2 : (received_ack ? 1 : 0);
@ -1272,7 +1272,7 @@ static void receive_shallow_info(struct fetch_pack_args *args,


if (reader->status != PACKET_READ_FLUSH && if (reader->status != PACKET_READ_FLUSH &&
reader->status != PACKET_READ_DELIM) reader->status != PACKET_READ_DELIM)
die("error processing shallow info: %d", reader->status); die(_("error processing shallow info: %d"), reader->status);


setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, NULL); setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, NULL);
args->deepen = 1; args->deepen = 1;
@ -1287,7 +1287,7 @@ static void receive_wanted_refs(struct packet_reader *reader, struct ref *refs)
struct ref *r = NULL; struct ref *r = NULL;


if (parse_oid_hex(reader->line, &oid, &end) || *end++ != ' ') if (parse_oid_hex(reader->line, &oid, &end) || *end++ != ' ')
die("expected wanted-ref, got '%s'", reader->line); die(_("expected wanted-ref, got '%s'"), reader->line);


for (r = refs; r; r = r->next) { for (r = refs; r; r = r->next) {
if (!strcmp(end, r->name)) { if (!strcmp(end, r->name)) {
@ -1297,11 +1297,11 @@ static void receive_wanted_refs(struct packet_reader *reader, struct ref *refs)
} }


if (!r) if (!r)
die("unexpected wanted-ref: '%s'", reader->line); die(_("unexpected wanted-ref: '%s'"), reader->line);
} }


if (reader->status != PACKET_READ_DELIM) if (reader->status != PACKET_READ_DELIM)
die("error processing wanted refs: %d", reader->status); die(_("error processing wanted refs: %d"), reader->status);
} }


enum fetch_state { enum fetch_state {