diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-12 19:47:39 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-12 19:47:39 +0300 |
| commit | dd610aeda684e42d3933a719cbd59ffbcdfdbcaa (patch) | |
| tree | 3001212a96785e66a7d82e18116badd5007bc0ef /builtin | |
| parent | 3787e3c16ced0e3a614766dfbb55f8cbd70762c1 (diff) | |
| parent | b3dfeebb92630c54db1e4f03dbcff0e05208c4c1 (diff) | |
Merge branch 'kw/patch-ids-optim'
When "git rebase" tries to compare set of changes on the updated
upstream and our own branch, it computes patch-id for all of these
changes and attempts to find matches. This has been optimized by
lazily computing the full patch-id (which is expensive) to be
compared only for changes that touch the same set of paths.
* kw/patch-ids-optim:
rebase: avoid computing unnecessary patch IDs
patch-ids: add flag to create the diff patch id using header only data
patch-ids: replace the seen indicator with a commit pointer
patch-ids: stop using a hand-rolled hashmap implementation
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 1f116bea8c..92dc34dcb0 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1343,7 +1343,7 @@ static void prepare_bases(struct base_tree_info *bases, struct object_id *patch_id; if (commit->util) continue; - if (commit_patch_id(commit, &diffopt, sha1)) + if (commit_patch_id(commit, &diffopt, sha1, 0)) die(_("cannot get patch id")); ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id); patch_id = bases->patch_id + bases->nr_patch_id; |