t5400: expect success for denying deletion

diff --git a/builtin-remote.c b/builtin-remote.c
index 6b3325dfa9e0aa52d806d1c28692a05cf549abe4..e396a3ac9055aa91d0f808abb196fb6ea9a99a29 100644 (file)
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -337,7 +337,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;
@@ -412,10 +412,9 @@ static void show_list(const char *title, struct string_list *list,
                return;
 
        printf(title, list->nr > 1 ? "es" : "", extra_arg);
-       printf("\n    ");
-       for (i = 0; i < list->nr; i++)
-               printf("%s%s", i ? " " : "", list->items[i].string);
        printf("\n");
+       for (i = 0; i < list->nr; i++)
+               printf("    %s\n", list->items[i].string);
 }
 
 static int get_remote_ref_states(const char *name,
@@ -511,17 +510,17 @@ static int show(int argc, const char **argv)
                show_list("  Tracked remote branch%s", &states.tracked, "");
 
                if (states.remote->push_refspec_nr) {
-                       printf("  Local branch%s pushed with 'git push'\n   ",
+                       printf("  Local branch%s pushed with 'git push'\n",
                                states.remote->push_refspec_nr > 1 ?
                                        "es" : "");
                        for (i = 0; i < states.remote->push_refspec_nr; i++) {
                                struct refspec *spec = states.remote->push + i;
-                               printf(" %s%s%s%s", spec->force ? "+" : "",
+                               printf("    %s%s%s%s\n",
+                                      spec->force ? "+" : "",
                                       abbrev_branch(spec->src),
                                       spec->dst ? ":" : "",
                                       spec->dst ? abbrev_branch(spec->dst) : "");
                        }
-                       printf("\n");
                }
 
                /* NEEDSWORK: free remote */
@@ -566,7 +565,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/"));