Merge git-gui into ml/git-gui-exec-path-fix

[thirdparty/git.git] / revision.c

diff --git a/revision.c b/revision.c
index d66857ecc09a31886c9d70a0fe6ee2f6264ee312..2f4c53ea207b22a68097708b327884ae970c1978 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1,5 +1,4 @@
 #include "git-compat-util.h"
-#include "alloc.h"
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"
@@ -1561,7 +1560,7 @@ void init_ref_exclusions(struct ref_exclusions *exclusions)
 void clear_ref_exclusions(struct ref_exclusions *exclusions)
 {
        string_list_clear(&exclusions->excluded_refs, 0);
-       string_list_clear(&exclusions->hidden_refs, 0);
+       strvec_clear(&exclusions->hidden_refs);
        exclusions->hidden_refs_configured = 0;
 }
 
@@ -2642,7 +2641,7 @@ static int for_each_bisect_ref(struct ref_store *refs, each_ref_fn fn,
        struct strbuf bisect_refs = STRBUF_INIT;
        int status;
        strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
-       status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data);
+       status = refs_for_each_fullref_in(refs, bisect_refs.buf, NULL, fn, cb_data);
        strbuf_release(&bisect_refs);
        return status;
 }
@@ -2971,7 +2970,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
        if (!revs->def)
                revs->def = opt ? opt->def : NULL;
        if (opt && opt->tweak)
-               opt->tweak(revs, opt);
+               opt->tweak(revs);
        if (revs->show_merge)
                prepare_show_merge(revs);
        if (revs->def && !revs->pending.nr && !revs->rev_input_given) {