diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-13 16:50:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-13 16:54:35 -0800 |
| commit | 4a164d48df6bb1b4a771741c63d4437fd2dca0bb (patch) | |
| tree | 73e3b0ca16e8ea83e9f761af476736c29b24caf9 /fast-import.c | |
| parent | f8f2aaa17297d6b21c84641edc2f6135575a003c (diff) | |
| parent | 03840fc32d783be6750bf7e41a89687b8c3053eb (diff) | |
| download | git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.tar.gz git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.tar.xz | |
Merge branch 'jc/merge-base' (early part)
This contains an evil merge to fast-import, in order to
resolve in_merge_bases() update.
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 fd3b11757..404d91139 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1308,7 +1308,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)) { + if (!in_merge_bases(old_cmit, &new_cmit, 1)) { unlock_ref(lock); warn("Not updating %s" " (new tip %s does not contain %s)", |