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
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html