builtin/show-branch: rewrite functions to work with object_id

diff --git a/submodule.c b/submodule.c
index c0e6c81fc4656342fedeb4b5b68d9b938cb44b84..f0f34b6f4d1bf436edbfb4ab7c22c626e15e8266 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -429,10 +429,13 @@ static int has_remote(const char *refname, const unsigned char *sha1, int flags,
 
 static int submodule_needs_pushing(const char *path, const unsigned char sha1[20])
 {
+       struct each_ref_fn_sha1_adapter wrapped_has_remote =
+               {has_remote, NULL};
+
        if (add_submodule_odb(path) || !lookup_commit_reference(sha1))
                return 0;
 
-       if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
+       if (for_each_remote_ref_submodule(path, each_ref_fn_adapter, &wrapped_has_remote) > 0) {
                struct child_process cp = CHILD_PROCESS_INIT;
                const char *argv[] = {"rev-list", NULL, "--not", "--remotes", "-n", "1" , NULL};
                struct strbuf buf = STRBUF_INIT;
@@ -519,10 +522,13 @@ int find_unpushed_submodules(unsigned char new_sha1[20],
 
 static int push_submodule(const char *path)
 {
+       struct each_ref_fn_sha1_adapter wrapped_has_remote =
+               {has_remote, NULL};
+
        if (add_submodule_odb(path))
                return 1;
 
-       if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
+       if (for_each_remote_ref_submodule(path, each_ref_fn_adapter, &wrapped_has_remote) > 0) {
                struct child_process cp = CHILD_PROCESS_INIT;
                const char *argv[] = {"push", NULL};
 
@@ -626,7 +632,10 @@ static int add_sha1_to_array(const char *ref, const unsigned char *sha1,
 void check_for_new_submodule_commits(unsigned char new_sha1[20])
 {
        if (!initialized_fetch_ref_tips) {
-               for_each_ref(add_sha1_to_array, &ref_tips_before_fetch);
+               struct each_ref_fn_sha1_adapter wrapped_add_sha1_to_array =
+                       {add_sha1_to_array, &ref_tips_before_fetch};
+
+               for_each_ref(each_ref_fn_adapter, &wrapped_add_sha1_to_array);
                initialized_fetch_ref_tips = 1;
        }
 
@@ -1100,16 +1109,11 @@ void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir)
        struct strbuf file_name = STRBUF_INIT;
        struct strbuf rel_path = STRBUF_INIT;
        const char *real_work_tree = xstrdup(real_path(work_tree));
-       FILE *fp;
 
        /* Update gitfile */
        strbuf_addf(&file_name, "%s/.git", work_tree);
-       fp = fopen(file_name.buf, "w");
-       if (!fp)
-               die(_("Could not create git link %s"), file_name.buf);
-       fprintf(fp, "gitdir: %s\n", relative_path(git_dir, real_work_tree,
-                                                 &rel_path));
-       fclose(fp);
+       write_file(file_name.buf, 1, "gitdir: %s\n",
+                  relative_path(git_dir, real_work_tree, &rel_path));
 
        /* Update core.worktree setting */
        strbuf_reset(&file_name);