diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-05 15:06:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-05 15:06:26 -0800 |
| commit | 6376463c37e0371a411013b90b2e8fc0f7d27dfa (patch) | |
| tree | d2f08dd76391e6afad72a825bbd072ef53683281 /diff-lib.c | |
| parent | 2de34784dfcbb4fe0febe9ab98e0b99138040109 (diff) | |
| parent | fce135c4ffc87f85e1c3b5c57a6d9e1abdbd074d (diff) | |
| download | git-6376463c37e0371a411013b90b2e8fc0f7d27dfa.tar.gz | |
Merge branch 'ks/combine-diff'
Teach combine-diff to honour the path-output-order imposed by
diffcore-order, and optimize how matching paths are found in
the N-way diffs made with parents.
* ks/combine-diff:
tests: add checking that combine-diff emits only correct paths
combine-diff: simplify intersect_paths() further
combine-diff: combine_diff_path.len is not needed anymore
combine-diff: optimize combine_diff_path sets intersection
diff test: add tests for combine-diff with orderfile
diffcore-order: export generic ordering interface
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/diff-lib.c b/diff-lib.c index 2eddc66bbd..ec5f722eff 100644 --- 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; |