From 71aa2b8f0ee7cb2e60871f327996af21af88a668 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 13 Nov 2007 13:45:11 -0800 Subject: [PATCH] Resurrect git-revert.sh example and add comment to builtin-revert.c I had to scratch my head for quite some time figuring out why we cannot optimize out write_tree() we do when --no-commit option is given, whose purpose seem to be only to check if the index is unmerged, with a simple loop over the active_cache[]. So add a comment to describe why the write_tree() is there, and resurrect the last scripted version as a reference material in contrib/example directory with others. Signed-off-by: Junio C Hamano --- builtin-revert.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin-revert.c b/builtin-revert.c index 62ab1fa1f..afc28845f 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -246,7 +246,9 @@ static int revert_or_cherry_pick(int argc, const char **argv) if (no_commit) { /* * We do not intend to commit immediately. We just want to - * merge the differences in. + * merge the differences in, so let's compute the tree + * that represents the "current" state for merge-recursive + * to work on. */ if (write_tree(head, 0, NULL)) die ("Your index file is unmerged."); -- 2.30.2