...another instance where we access a free()d ce.
Signed-off-by: Karsten Blees <bl...@dcon.de>
Am 19.10.2013 21:28, schrieb Thomas Rast:
> Is this the version that is currently in pu?
No, its from a rebased-to-next version . I didn't resend the patches because
nothing actually changed (except diff contexts). Sorry for the inconvenience.
> In any case 36850edb currently breaks several valgrind tests. You can
> valgrind only t6022.16 like so (that one test is sufficient to track it
> down and it's much faster that way):
> cd t
> ./t6022-merge-rename.sh --valgrind-only=16
Thanks, here's the fix.
read-cache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/read-cache.c b/read-cache.c
index fe90c3b..3f735f3 100644
@@ -1898,7 +1898,7 @@ int read_index_unmerged(struct index_state *istate)
new_ce->ce_mode = ce->ce_mode;
if (add_index_entry(istate, new_ce, 0))
return error("%s: cannot drop to stage #0",
i = index_name_pos(istate, new_ce->name, len);
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html