summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-11-11 21:56:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-11-11 21:56:31 (GMT)
commit371811751dcdf9c12ccd99299aaca4f59e768af2 (patch)
tree5d5285c452e328fd25da5dba3f93d0b41d433ff1
parent12133d52c1948d80a87c360a3265658d7345489f (diff)
parentdfbfb9f3771e9070f239458dd2e3b535b64c4012 (diff)
downloadgit-371811751dcdf9c12ccd99299aaca4f59e768af2.zip
git-371811751dcdf9c12ccd99299aaca4f59e768af2.tar.gz
git-371811751dcdf9c12ccd99299aaca4f59e768af2.tar.bz2
Merge branch 'rt/fetch-pack-error-message-fix'
An error message in fetch-pack executable that was newly marked for translation was misspelt, which has been fixed. * rt/fetch-pack-error-message-fix: fetch-pack.c: correct command at the beginning of an error message
-rw-r--r--fetch-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index cb45c34..601f077 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -240,7 +240,7 @@ static enum ack_type get_ack(int fd, unsigned char *result_sha1)
return ACK;
}
}
- die(_("git fetch_pack: expected ACK/NAK, got '%s'"), line);
+ die(_("git fetch-pack: expected ACK/NAK, got '%s'"), line);
}
static void send_request(struct fetch_pack_args *args,