diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 21:55:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 21:55:05 +0100 |
| commit | 098501527f2b5628f086d3d9d2fda87220c069a5 (patch) | |
| tree | d5874ea1c3185a6baa71719ff20e89ad57e53b46 /builtin/rev-parse.c | |
| parent | Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence' (diff) | |
| parent | get_merge_bases(): always clean-up object flags (diff) | |
| download | git-098501527f2b5628f086d3d9d2fda87220c069a5.tar.xz git-098501527f2b5628f086d3d9d2fda87220c069a5.zip | |
Merge branch 'jc/merge-bases'
The get_merge_bases*() API was easy to misuse by careless
copy&paste coders, leaving object flags tainted in the commits that
needed to be traversed.
* jc/merge-bases:
get_merge_bases(): always clean-up object flags
bisect: clean flags after checking merge bases
Diffstat (limited to 'builtin/rev-parse.c')
| -rw-r--r-- | builtin/rev-parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 35d3c43ed6..95328b80d9 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -279,7 +279,7 @@ static int try_difference(const char *arg) struct commit *a, *b; a = lookup_commit_reference(sha1); b = lookup_commit_reference(end); - exclude = get_merge_bases(a, b, 1); + exclude = get_merge_bases(a, b); while (exclude) { struct commit_list *n = exclude->next; show_rev(REVERSED, |