From d5be89d8ad88792a9716fbfdb499d6d852d0eff5 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sun, 21 Dec 2008 14:17:12 -0800 Subject: [PATCH] git-revert: record the parent against which a revert was made As described in Documentation/howto/revert-a-faulty-merge.txt, re-merging from a previously reverted a merge of a side branch may need a revert of the revert beforehand. Record against which parent the revert was made in the commit, so that later the user can figure out what went on. Signed-off-by: Robin Rosenberg Signed-off-by: Junio C Hamano --- builtin-revert.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/builtin-revert.c b/builtin-revert.c index 4038b4118d..d48313c745 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -352,6 +352,11 @@ static int revert_or_cherry_pick(int argc, const char **argv) add_to_msg(oneline_body + 1); add_to_msg("\"\n\nThis reverts commit "); add_to_msg(sha1_to_hex(commit->object.sha1)); + + if (commit->parents->next) { + add_to_msg(", reversing\nchanges made to "); + add_to_msg(sha1_to_hex(parent->object.sha1)); + } add_to_msg(".\n"); } else { base = parent;