sequencer: rename reset_for_rollback to reset_merge

diff --git a/builtin/archive.c b/builtin/archive.c
index 2fe1f05ca2021f76c4388269fccddf31b7e6fc53..45d11669aae459caf95bb6b4737558297debae89 100644 (file)
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -53,15 +53,15 @@ static int run_remote_archiver(int argc, const char **argv,
                packet_write_fmt(fd[1], "argument %s\n", argv[i]);
        packet_flush(fd[1]);
 
-       packet_reader_init(&reader, fd[0], NULL, 0, PACKET_READ_CHOMP_NEWLINE);
+       packet_reader_init(&reader, fd[0], NULL, 0,
+                          PACKET_READ_CHOMP_NEWLINE |
+                          PACKET_READ_DIE_ON_ERR_PACKET);
 
        if (packet_reader_read(&reader) != PACKET_READ_NORMAL)
                die(_("git archive: expected ACK/NAK, got a flush packet"));
        if (strcmp(reader.line, "ACK")) {
                if (starts_with(reader.line, "NACK "))
                        die(_("git archive: NACK %s"), reader.line + 5);
-               if (starts_with(reader.line, "ERR "))
-                       die(_("remote error: %s"), reader.line + 4);
                die(_("git archive: protocol error"));
        }