am: suppress apply errors when using 3-way

diff --git a/builtin-push.c b/builtin-push.c
index bbf019850e5b93a2e36584fc00573dd180a19be0..c869974013b5c1bb563d4f9b306820362545c9ea 100644 (file)
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -118,8 +118,11 @@ static int do_push(const char *repo, int flags)
        int i, errs;
        struct remote *remote = remote_get(repo);
 
-       if (!remote)
-               die("bad repository '%s'", repo);
+       if (!remote) {
+               if (repo)
+                       die("bad repository '%s'", repo);
+               die("No destination configured to push to.");
+       }
 
        if (remote->mirror)
                flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
@@ -195,7 +198,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
 
-       argc = parse_options(argc, argv, options, push_usage, 0);
+       argc = parse_options(argc, argv, prefix, options, push_usage, 0);
 
        if (tags)
                add_refspec("refs/tags/*");