Re: [PATCH 1/3] read-trees: refactor the unpack_trees() part

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 31, 2006, 00:48 UTC
Message-ID: <Pine.LNX.4.63.0607310238170.29667@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <Pine.LNX.4.63.0607310205260.29667@wbgn013.biozentrum.uni-wuerzburg.de>

Hi,

On Mon, 31 Jul 2006, Johannes Schindelin wrote:

> How about this (on top of that patch):
> 
> -- 8< --
> [PATCH 1.5/3] unpack-trees: please C99 standard

Of course, I got bitten by "git-commit" not regarding any git-update-index'ed files after starting the editor... This is needed as well:

diff --git a/unpack-trees.c b/unpack-trees.c
index 3cb92cb..e595d23 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -381,6 +381,7 @@ int unpack_trees(struct object_list *tre
 	state.refresh_cache = 1;
 
 	o->merge_size = len;
+	memset(&df_conflict_entry, 0, sizeof(df_conflict_entry));
 	o->df_conflict_entry = &df_conflict_entry;
 
 	if (len) {

Sorry for the noise.

Ciao,
Dscho