From 9196e825875dce66f6bc95dda01f5833f20bc5e5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 16 Jul 2008 20:25:18 -0700 Subject: [PATCH] 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 --- rerere.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rerere.c b/rerere.c index 12589215e8..0456aa6376 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; } }