Merge branch 'ks/combine-diff'

diff --git a/diff-lib.c b/diff-lib.c
index 2eddc66bbd5cf37e4649e219a28c951ed134557c..ec5f722eff72ba3dff4b64f0961fa8e65a259170 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -125,7 +125,6 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
                        dpath->path = (char *) &(dpath->parent[5]);
 
                        dpath->next = NULL;
-                       dpath->len = path_len;
                        memcpy(dpath->path, ce->name, path_len);
                        dpath->path[path_len] = '\0';
                        hashclr(dpath->sha1);
@@ -327,7 +326,6 @@ static int show_modified(struct rev_info *revs,
                p = xmalloc(combine_diff_path_size(2, pathlen));
                p->path = (char *) &p->parent[2];
                p->next = NULL;
-               p->len = pathlen;
                memcpy(p->path, new->name, pathlen);
                p->path[pathlen] = 0;
                p->mode = mode;