Merge branch 'pa/auto-gc-mac-osx'

diff --git a/builtin/merge.c b/builtin/merge.c
index f89f60e11a523d45a81c3bd3a92fa9b4c5021673..85c54dcd5a21f2b8413e5f73585f5f0a6c4c5715 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -933,7 +933,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."));