diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 23:55:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 23:55:05 +0300 |
| commit | 098501527f2b5628f086d3d9d2fda87220c069a5 (patch) | |
| tree | d5874ea1c3185a6baa71719ff20e89ad57e53b46 /submodule.c | |
| parent | 58e0362eddba1678a71c8990862053ff989527b6 (diff) | |
| parent | 2ce406ccb85c4546b6d19309a6101b37c7bd952e (diff) | |
Merge branch 'jc/merge-bases'
The get_merge_bases*() API was easy to misuse by careless
copy&paste coders, leaving object flags tainted in the commits that
needed to be traversed.
* jc/merge-bases:
get_merge_bases(): always clean-up object flags
bisect: clean flags after checking merge bases
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 0690dc50d0..d37d400b22 100644 --- a/submodule.c +++ b/submodule.c @@ -301,7 +301,7 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path, left->object.flags |= SYMMETRIC_LEFT; add_pending_object(rev, &left->object, path); add_pending_object(rev, &right->object, path); - merge_bases = get_merge_bases(left, right, 1); + merge_bases = get_merge_bases(left, right); if (merge_bases) { if (merge_bases->item == left) *fast_forward = 1; |