All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] push: start warning upcoming default change for push.default
Date: Wed, 20 Jun 2012 12:51:05 -0700	[thread overview]
Message-ID: <7v62alvk2e.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7va9zxvkyp.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 20 Jun 2012 12:31:42 -0700")

Junio C Hamano <gitster@pobox.com> writes:

> Telling somebody who would blindly follow what was suggested to use
> 'current' is what bothers me.

That is (quoting the difference between the previous round and this
one),

 static char warn_unspecified_push_default_msg[] =
 N_("push.default is unset; its implicit value is changing in\n"
    "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
    "and maintain the current behavior after the default changes, use:\n"
    "\n"
    "  git config --global push.default matching\n"
    "\n"
    "To squelch this message and adopt the new behavior now, use:\n"
    "\n"
    "  git config --global push.default simple\n"
    "\n"
-   "See 'git help config' and search for 'push.default' for further information.");
+   "See 'git help config' and search for 'push.default' for further information.\n"
+   "(the 'simple' mode was introduced in Git 1.7.11. Use 'current' instead if\n"
+   "you sometimes use older versions of Git)");

The latter half of the message is "To *adopt* the *new behaviour
now*" but setting it to 'current' is not adopting the new behaviour.

Perhaps we should say more to help people decide which one to choose
in this message.

    ... changing in Git 2.0 from 'matching' to 'simple'.
    'matching', which is the current default, pushes all branches
    that exist at the remote.  'simple', which will be the new
    default, pushes only the current branch to update the branch at
    the remote of the same name (the 'simple' mode is only available
    in Git 1.7.11 or newer; older versions of Git has a similar mode
    called 'current').

    You can squelch this message by picking your preferred default now,
    e.g. running one of these:

            git config push.default matching
            git config push.default simple
            git config push.default current

or something?

  parent reply	other threads:[~2012-06-20 19:51 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-19 23:46 What's cooking in git.git (Jun 2012, #05; Tue, 19) Junio C Hamano
2012-06-20 12:35 ` [PATCH] push: start warning upcoming default change for push.default Matthieu Moy
2012-06-20 17:55   ` Junio C Hamano
2012-06-20 18:24     ` Matthieu Moy
2012-06-20 19:31       ` Junio C Hamano
2012-06-20 19:45         ` Matthieu Moy
2012-06-20 19:51         ` Junio C Hamano [this message]
2012-06-21 15:50           ` Matthieu Moy
2012-06-21 17:00             ` Junio C Hamano
2012-06-21 17:08               ` Matthieu Moy
2012-06-21 17:21                 ` Junio C Hamano
2012-06-21 17:46                   ` Junio C Hamano
2012-06-22  7:57                   ` Matthieu Moy
2012-06-22 17:48                     ` Junio C Hamano
2012-06-24 11:01                       ` Matthieu Moy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7v62alvk2e.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.