mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fold get_merge_bases_clean() into get_merge_bases()

Browse Source 
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>
This commit is contained in:
Rene Scharfe
2006-07-02 11:49:38 +02:00
committed by Junio C Hamano
parent 31aea7ef77
commit c0fa8255c6
4 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
commit.h
View File

@ -105,7 +105,6 @@ struct commit_graft *read_graft_line(char *buf, int len);
int register_commit_graft(struct commit_graft *, int);
int read_graft_file(const char *graft_file);
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
extern struct commit_list *get_merge_bases_clean(struct commit *rev1, struct commit *rev2);
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
#endif /* COMMIT_H */