From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Thu, 7 Jun 2012 12:05:14 +0000 (+0700)
Subject: rerere: remove i18n legos in result message
X-Git-Tag: v1.7.12-rc0~86^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72a23e6449bc29358760b2ccdfacbd9aa37e9b36;p=thirdparty%2Fgit.git

rerere: remove i18n legos in result message

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/rerere.c b/rerere.c
index dcb525a4d0..da18fc37df 100644
--- a/rerere.c
+++ b/rerere.c
@@ -544,13 +544,13 @@ static int do_plain_rerere(struct string_list *rr, int fd)
 
 		if (has_rerere_resolution(name)) {
 			if (!merge(name, path)) {
-				if (rerere_autoupdate)
+				const char *msg;
+				if (rerere_autoupdate) {
 					string_list_insert(&update, path);
-				fprintf(stderr,
-					"%s '%s' using previous resolution.\n",
-					rerere_autoupdate
-					? "Staged" : "Resolved",
-					path);
+					msg = "Staged '%s' using previous resolution.\n";
+				} else
+					msg = "Resolved '%s' using previous resolution.\n";
+				fprintf(stderr, msg, path);
 				goto mark_resolved;
 			}
 		}