diff options
| author | Rene Scharfe <rene.scharfe@lsrfire.ath.cx> | 2006-07-02 01:29:26 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-01 18:13:25 -0700 |
| commit | 31609c17251f368584f7b94d44b06194112b4251 (patch) | |
| tree | 5ce49fdf0575f1716310b52b94db51f308ee891c /commit.c | |
| parent | 7c6f8aaf6d795f0c9a75671acceb9754ea06fd81 (diff) | |
| download | git-31609c17251f368584f7b94d44b06194112b4251.tar.gz git-31609c17251f368584f7b94d44b06194112b4251.tar.xz | |
Add get_merge_bases_clean()
Add get_merge_bases_clean(), a wrapper for get_merge_bases() that cleans
up after doing its work and make get_merge_bases() NOT clean up.
Single-shot programs like git-merge-base can use the dirty and fast
version.
Also move the object flags used in get_merge_bases() out of the range
defined in revision.h. This fixes the "66ae0c77...ced9456a
89719209...262a6ef7" test of the ... operator which is introduced with
the next patch.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'commit.c')
| -rw-r--r-- | commit.c | 20 |
1 files changed, 16 insertions, 4 deletions
@@ -849,9 +849,10 @@ void sort_in_topological_order_fn(struct commit_list ** list, int lifo, /* merge-rebase stuff */ -#define PARENT1 1 -#define PARENT2 2 -#define UNINTERESTING 4 +/* bits #0..7 in revision.h */ +#define PARENT1 (1u<< 8) +#define PARENT2 (1u<< 9) +#define UNINTERESTING (1u<<10) static struct commit *interesting(struct commit_list *list) { @@ -1080,9 +1081,20 @@ struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2) tmp = next; } - /* reset flags */ + return result; +} + +struct commit_list *get_merge_bases_clean(struct commit *rev1, + struct commit *rev2) +{ + unsigned int flags1 = rev1->object.flags; + unsigned int flags2 = rev2->object.flags; + struct commit_list *result = get_merge_bases(rev1, rev2); + clear_commit_marks(rev1, PARENT1 | PARENT2 | UNINTERESTING); clear_commit_marks(rev2, PARENT1 | PARENT2 | UNINTERESTING); + rev1->object.flags = flags1; + rev2->object.flags = flags2; return result; } |