builtin/difftool: use parse_oid_hex

diff --git a/builtin/push.c b/builtin/push.c
index efb3e38a8d5fe7c3219c2ed7f7ae4502a2c3f1ab..021dd3b1e48979086de68a434d4eddbbeb074df3 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -143,7 +143,9 @@ static int push_url_of_remote(struct remote *remote, const char ***url_p)
        return remote->url_nr;
 }
 
-static NORETURN int die_push_simple(struct branch *branch, struct remote *remote) {
+static NORETURN int die_push_simple(struct branch *branch,
+                                   struct remote *remote)
+{
        /*
         * There's no point in using shorten_unambiguous_ref here,
         * as the ambiguity would be on the remote side, not what
@@ -173,10 +175,10 @@ static NORETURN int die_push_simple(struct branch *branch, struct remote *remote
              "\n"
              "To push to the branch of the same name on the remote, use\n"
              "\n"
-             "    git push %s %s\n"
+             "    git push %s HEAD\n"
              "%s"),
            remote->name, short_upstream,
-           remote->name, branch->name, advice_maybe);
+           remote->name, advice_maybe);
 }
 
 static const char message_detached_head_die[] =