summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorRene Scharfe <rene.scharfe@lsrfire.ath.cx>2006-07-02 09:49:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-02 17:58:25 (GMT)
commitc0fa8255c652e148f0910425d2cc2b8029065008 (patch)
treeb649c755844913b1637b914ef6398707b8907021 /revision.c
parent31aea7ef77aff64a02afe1ea5f10375565911808 (diff)
downloadgit-c0fa8255c652e148f0910425d2cc2b8029065008.zip
git-c0fa8255c652e148f0910425d2cc2b8029065008.tar.gz
git-c0fa8255c652e148f0910425d2cc2b8029065008.tar.bz2
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 'revision.c')
-rw-r--r--revision.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index 9eb0b6d..27fc1e3 100644
--- a/revision.c
+++ b/revision.c
@@ -813,7 +813,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
}
if (symmetric) {
- exclude = get_merge_bases_clean(a, b);
+ exclude = get_merge_bases(a, b, 1);
add_pending_commit_list(revs, exclude,
flags_exclude);
a->object.flags |= flags;