Merge branch 'rt/fetch-pack-error-message-fix'

gitster · gitster · commit 371811751dcd · 2016-11-11T13:56:31.000-08:00
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
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ static enum ack_type get_ack(int fd, unsigned char *result_sha1)`
`240`	`240`	`return ACK;`
`241`	`241`	`}`
`242`	`242`	`}`
`243`		`- die(_("git fetch_pack: expected ACK/NAK, got '%s'"), line);`
	`243`	`+ die(_("git fetch-pack: expected ACK/NAK, got '%s'"), line);`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`static void send_request(struct fetch_pack_args *args,`