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>
Junio C Hamano committed
Jul 16, 2008 at 20:25 UTC
9196e825875dce66f6bc95dda01f5833f20bc5e5
1 file changed
+5
-2
rerere.c
+5
-2
@@ -278,10 +278,13 @@ static int do_plain_rerere(struct path_list *rr, int fd)
278
279
if (has_resolution(name)) {
280
if (!merge(name, path)) {
281
- fprintf(stderr, "Resolved '%s' using "
282
- "previous resolution.\n", path);
281
if (rerere_autoupdate)
282
path_list_insert(path, &update);
283
+ fprintf(stderr,
284
+ "%s '%s' using previous resolution.\n",
285
+ rerere_autoupdate
286
+ ? "Staged" : "Resolved",
287
+ path);
288
goto mark_resolved;
289
}
290
}