diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit

diff --git a/remote.c b/remote.c
index 698a890a835cdb03dc1792d331e6b8bc3aed625c..685e776a65ed9c971ab6952ebfd886f78b451181 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1629,7 +1629,7 @@ static void set_merge(struct branch *ret)
                    strcmp(ret->remote_name, "."))
                        continue;
                if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
-                            oid.hash, &ref) == 1)
+                            &oid, &ref) == 1)
                        ret->merge[i]->dst = ref;
                else
                        ret->merge[i]->dst = xstrdup(ret->merge_name[i]);