From: Junio C Hamano <junkio@cox.net>
Date: Thu, 02 Feb 2006 08:27:36 GMT
Subject: Re: The merge from hell...
Message-ID: <7v3bj2tbbb.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <cc723f590602020007s43f89d10i4529d118ade7c764@mail.gmail.com>

Aneesh Kumar <aneesh.kumar@gmail.com> writes:

> Ok i tried using --cc. But then as per the man page if the
> optimization makes the all the hunks disapper then commit log is not
> show unless -m is used. Is there a way to get the commit log printed.

Yes, there is a way.  I need to fix a bug ;-).

This patch was done on top of the other two patches I sent
earlier tonight, but should apply on top of master even if you
have not applied the other two.

--

diff --git a/combine-diff.c b/combine-diff.c
index 44931b2..45f1822 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -675,6 +675,8 @@ int diff_tree_combined_merge(const unsig
 					       show_empty_merge))
 				header = NULL;
 		}
+		if (header)
+			puts(header);
 	}
 
 	/* Clean things up */