On Sat, Jul 15, 2017 at 07:18:51PM +0200, René Scharfe wrote:
> -- >8 --
> Subject: [PATCH] tree-diff: don't access hash of NULL object_id pointer
>
> The object_id pointers can be NULL for invalid entries. Don't try to
> dereference them and pass NULL along to fill_tree_descriptor() instead,
> w
Am 30.05.2017 um 19:31 schrieb Brandon Williams:
> @@ -273,21 +274,20 @@ static struct combine_diff_path *emit_path(struct
> combine_diff_path *p,
> }
>
> if (recurse) {
> - const unsigned char **parents_sha1;
> + const struct object_id **parents_oid;
>
>
Brandon Williams writes:
> @@ -220,7 +221,7 @@ static struct combine_diff_path *emit_path(struct
> combine_diff_path *p,
> if (emitthis) {
> int keep;
> struct combine_diff_path *pprev = p;
> - p = path_appendnew(p, nparent, base, path, pathlen, mode
On Wed, May 31, 2017 at 05:29:20PM -0400, Jeff King wrote:
> Or did you mean that diff_tree_paths() could now take an actual
> array-of-struct rather than an array-of-pointer-to-struct? That would
> drop the "parents_oid" array entirely. I think that's actually
> orthogonal to this change (the sam
On Wed, May 31, 2017 at 11:24:33AM -0700, Stefan Beller wrote:
> On Tue, May 30, 2017 at 10:31 AM, Brandon Williams wrote:
> >
> > Signed-off-by: Brandon Williams
> > ---
> > combine-diff.c | 10 +-
> > diff.h | 4 ++--
> > tree-diff.c| 63
> > +
On Tue, May 30, 2017 at 10:31 AM, Brandon Williams wrote:
>
> Signed-off-by: Brandon Williams
> ---
> combine-diff.c | 10 +-
> diff.h | 4 ++--
> tree-diff.c| 63
> +-
> 3 files changed, 39 insertions(+), 38 deletions
Signed-off-by: Brandon Williams
---
combine-diff.c | 10 +-
diff.h | 4 ++--
tree-diff.c| 63 +-
3 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/combine-diff.c b/combine-diff.c
index 04c4ae856..ec9d9304
7 matches
Mail list logo