Merge branch 'jk/maint-commit-v-strip' into maint

diff --git a/builtin-remote.c b/builtin-remote.c
index 90a4e35828697f349a38ba3486c40813db32cee0..5af4e643eb9dceccc62a5ce44069e0164bc12311 100644 (file)
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -323,7 +323,7 @@ static int add_branch_for_removal(const char *refname,
 
        /* make sure that symrefs are deleted */
        if (flags & REF_ISSYMREF)
-               return unlink(git_path(refname));
+               return unlink(git_path("%s", refname));
 
        item = string_list_append(refname, branches->branches);
        item->util = xmalloc(20);
@@ -340,7 +340,7 @@ static int remove_branches(struct string_list *branches)
                const char *refname = item->string;
                unsigned char *sha1 = item->util;
 
-               if (delete_ref(refname, sha1))
+               if (delete_ref(refname, sha1, 0))
                        result |= error("Could not remove branch %s", refname);
        }
        return result;
@@ -570,7 +570,7 @@ static int prune(int argc, const char **argv)
                        const char *refname = states.stale.items[i].util;
 
                        if (!dry_run)
-                               result |= delete_ref(refname, NULL);
+                               result |= delete_ref(refname, NULL, 0);
 
                        printf(" * [%s] %s\n", dry_run ? "would prune" : "pruned",
                               abbrev_ref(refname, "refs/remotes/"));