diff options
| author | Rene Scharfe <rene.scharfe@lsrfire.ath.cx> | 2006-07-02 11:49:38 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-02 10:58:25 -0700 |
| commit | c0fa8255c652e148f0910425d2cc2b8029065008 (patch) | |
| tree | b649c755844913b1637b914ef6398707b8907021 /merge-base.c | |
| parent | 31aea7ef77aff64a02afe1ea5f10375565911808 (diff) | |
| download | git-c0fa8255c652e148f0910425d2cc2b8029065008.tar.gz | |
Fold get_merge_bases_clean() into get_merge_bases()
Change get_merge_bases() to be able to clean up after itself if
needed by adding a cleanup parameter.
We don't need to save the flags and restore them afterwards anymore;
that was a leftover from before the flags were moved out of the
range used in revision.c. clear_commit_marks() sets them to zero,
which is enough.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-base.c')
| -rw-r--r-- | merge-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-base.c b/merge-base.c index b41f76cb72..59f723f404 100644 --- a/merge-base.c +++ b/merge-base.c @@ -6,7 +6,7 @@ static int show_all = 0; static int merge_base(struct commit *rev1, struct commit *rev2) { - struct commit_list *result = get_merge_bases(rev1, rev2); + struct commit_list *result = get_merge_bases(rev1, rev2, 0); if (!result) return 1; |