aboutsummaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorRene Scharfe <rene.scharfe@lsrfire.ath.cx>2006-07-02 11:49:38 +0200
committerJunio C Hamano <junkio@cox.net>2006-07-02 10:58:25 -0700
commitc0fa8255c652e148f0910425d2cc2b8029065008 (patch)
treeb649c755844913b1637b914ef6398707b8907021 /diff-lib.c
parent31aea7ef77aff64a02afe1ea5f10375565911808 (diff)
downloadgit-c0fa8255c652e148f0910425d2cc2b8029065008.tar.gz
git-c0fa8255c652e148f0910425d2cc2b8029065008.tar.xz
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 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions