for-each-ref: accept "%(push)" format

diff --git a/builtin/merge.c b/builtin/merge.c
index 3b0f8f96d4168463139d15f1cde655facc73426c..1840317118ab444a56cc0c66a0905a1c1b3650b4 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -955,7 +955,7 @@ static int setup_with_upstream(const char ***argv)
 
        if (!branch)
                die(_("No current branch."));
-       if (!branch->remote)
+       if (!branch->remote_name)
                die(_("No remote for the current branch."));
        if (!branch->merge_nr)
                die(_("No default upstream defined for the current branch."));