diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:35:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:36:05 -0700 |
| commit | 34f5130af84f7a37fba327d5a5be4f4427dc6886 (patch) | |
| tree | 1f8836fe7fb70566e31b3f4f5d1475fabd95981b /fast-import.c | |
| parent | 0083f1d43a7280aefa23656eaac7266139484b24 (diff) | |
| parent | f37d3c755209234acfc2ca280027ebdab8e9ea8a (diff) | |
| download | git-34f5130af84f7a37fba327d5a5be4f4427dc6886.tar.gz git-34f5130af84f7a37fba327d5a5be4f4427dc6886.tar.xz | |
Merge branch 'jc/merge-bases'
Optimise the "merge-base" computation a bit, and also update its
users that do not need the full merge-base information to call a
cheaper subset.
* jc/merge-bases:
reduce_heads(): reimplement on top of remove_redundant()
merge-base: "--is-ancestor A B"
get_merge_bases_many(): walk from many tips in parallel
in_merge_bases(): use paint_down_to_common()
merge_bases_many(): split out the logic to paint history
in_merge_bases(): omit unnecessary redundant common ancestor reduction
http-push: use in_merge_bases() for fast-forward check
receive-pack: use in_merge_bases() for fast-forward check
in_merge_bases(): support only one "other" commit
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index eed97c8fa..c2a814ec6 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1691,7 +1691,7 @@ static int update_branch(struct branch *b) return error("Branch %s is missing commits.", b->name); } - if (!in_merge_bases(old_cmit, &new_cmit, 1)) { + if (!in_merge_bases(old_cmit, new_cmit)) { unlock_ref(lock); warning("Not updating %s" " (new tip %s does not contain %s)", |