From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Jul 2008 03:25:18 +0000 (-0700)
Subject: rerere.autoupdate: change the message when autoupdate is in effect
X-Git-Tag: v1.6.0-rc0~1^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9196e825875dce66f6bc95dda01f5833f20bc5e5;p=git.git

rerere.autoupdate: change the message when autoupdate is in effect

This changes the message rerere issues after reusing previous conflict
resolution from "Resolved" to "Staged" when autoupdate option is in
effect.

It is envisioned that in practice, some auto resolitions are trickier and
iffier than others, and we would want to add a feature to mark individual
resolutions as "this is ok to autoupdate" or "do not autoupdate the result
using this resolution even when rerere.autoupdate is in effect" in the
future.  When that happens, these messages will make the distinction
clearer.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/rerere.c b/rerere.c
index 12589215e..0456aa637 100644
--- a/rerere.c
+++ b/rerere.c
@@ -278,10 +278,13 @@ static int do_plain_rerere(struct path_list *rr, int fd)
 
 		if (has_resolution(name)) {
 			if (!merge(name, path)) {
-				fprintf(stderr, "Resolved '%s' using "
-						"previous resolution.\n", path);
 				if (rerere_autoupdate)
 					path_list_insert(path, &update);
+				fprintf(stderr,
+					"%s '%s' using previous resolution.\n",
+					rerere_autoupdate
+					? "Staged" : "Resolved",
+					path);
 				goto mark_resolved;
 			}
 		}