From: Patrick Steinhardt <ps@pks.im>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Junio C Hamano <gitster@pobox.com>,
Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH v5 00/15] config: make git_config_set die on failure
Date: Wed, 17 Feb 2016 11:35:48 +0100 [thread overview]
Message-ID: <20160217103548.GC743@pks-xps.fritz.box> (raw)
In-Reply-To: <CAPig+cQav4AS6-RwUKGA2fmWxRL-2e2o72oYkk83emqz3z6q3w@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1915 bytes --]
On Tue, Feb 16, 2016 at 12:15:35PM -0500, Eric Sunshine wrote:
> On Tue, Feb 16, 2016 at 7:56 AM, Patrick Steinhardt <ps@pks.im> wrote:
> > [...]
> > Junio pointed out that it might not always be the most sensible
> > thing to die when install_branch_config fails. After thinking
> > about it I changed the behavior of the function to print an error
> > and advise message and return an error code. The error code is
> > then only used by the `git branch --set-upstream-to=` command to
> > abort early, as its main intent will usually be to set the
> > tracking information. The other callers (related to git-clone and
> > git-push) simply ignore the returned value while the messages are
> > still printed.
> >
> > I think it does make sense to not abort clones and pushes when
> > the function fails. Setting the upstream information is only a
> > small part of these commands and especially when cloning a large
> > repository it is harmful to die as this would delete everything
> > that has just been cloned. The user can still fix up the remote
> > tracking branch afterwards.
> >
> > Interdiff between v4 and v5:
> >
> > diff --git a/branch.c b/branch.c
> > @@ -49,7 +49,13 @@ static int should_setup_rebase(const char *origin)
> > +static const char tracking_advice[] =
> > +N_("\n"
> > +"After fixing the error cause you may try to fix up\n"
> > +"the remote tracking information by invoking\n"
> > +"\"git branch --set-upstream-to=\".");
>
> Do you have enough information at the point this message is emitted to
> make it even more useful for the user by showing the actual argument
> to --set-upstream-to= that the user would need to invoke once the
> issue is resolved?
Actually, yes. The message is invoked by `install_branch_config`
which naturally has to know what upstream we want to set to. Will
improve the message in the next revision, thanks.
Patrick
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2016-02-17 10:35 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 12:56 [PATCH v5 00/15] config: make git_config_set die on failure Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 01/15] config: introduce set_or_die wrappers Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 02/15] branch: report errors in tracking branch setup Patrick Steinhardt
2016-02-16 23:07 ` Junio C Hamano
2016-02-17 10:34 ` Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 03/15] branch: die on config error when unsetting upstream Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 04/15] branch: die on config error when editing branch description Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 05/15] submodule: die on config error when linking modules Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 06/15] submodule--helper: die on config error when cloning module Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 07/15] remote: die on config error when setting URL Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 08/15] remote: die on config error when setting/adding branches Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 09/15] remote: die on config error when manipulating remotes Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 10/15] clone: die on config error in cmd_clone Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 11/15] init-db: die on config errors when initializing empty repo Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 12/15] sequencer: die on config error when saving replay opts Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 13/15] compat: die when unable to set core.precomposeunicode Patrick Steinhardt
2016-02-17 9:14 ` Lars Schneider
2016-02-17 10:34 ` Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 14/15] config: rename git_config_set to git_config_set_gently Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 15/15] config: rename git_config_set_or_die to git_config_set Patrick Steinhardt
2016-02-17 20:57 ` Michael Blume
2016-02-17 21:02 ` Michael Blume
2016-02-17 21:09 ` Junio C Hamano
2016-02-16 17:15 ` [PATCH v5 00/15] config: make git_config_set die on failure Eric Sunshine
2016-02-17 10:35 ` Patrick Steinhardt [this message]
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=20160217103548.GC743@pks-xps.fritz.box \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
--cc=sunshine@sunshineco.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).