From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Bert Wesarg <bert.wesarg@googlemail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2] remote rename: rename branch.<name>.pushRemote config values too
Date: Fri, 17 Jan 2020 14:30:42 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2001171428170.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <CAKPyHN0eTa9LC35oqsy0Dce0qpOJAx159HR+QyguDt_NZ2he_w@mail.gmail.com>
Hi Bert,
On Fri, 17 Jan 2020, Bert Wesarg wrote:
> On Fri, Jan 17, 2020 at 12:50 PM Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
> >
> > Hi Bert,
> >
> > On Fri, 17 Jan 2020, Bert Wesarg wrote:
> >
> > > When renaming a remote with
> > >
> > > git remote rename X Y
> > >
> > > Git already renames any config values from
> > >
> > > branch.<name>.remote = X
> > >
> > > to
> > >
> > > branch.<name>.remote = Y
> > >
> > > As branch.<name>.pushRemote also names a remote, it now also renames
> > > these config values from
> > >
> > > branch.<name>.pushRemote = X
> > >
> > > to
> > >
> > > branch.<name>.pushRemote = Y
> >
> > Should we warn if remote.pushDefault = X?
>
> AFAIU, the value of remote.pushDefault wont be renamed yet. So you
> suggest to issue a warning in case remote.pushDefault is X. But as X
> does not exists anymore after the rename, the value of
> remote.pushDefault is invalid. So why not rename it too?
If this setting was usually a repository-specific one, I would suggest to
change its value, too. But it is my understanding that this might be set
in `~/.gitconfig` more often than not, so I recommend a warning instead.
> > > @@ -305,7 +309,7 @@ static int config_read_branches(const char *key, const char *value, void *cb)
> > > space = strchr(value, ' ');
> > > }
> > > string_list_append(&info->merge, xstrdup(value));
> > > - } else {
> > > + } else if (type == REBASE) {
> > > int v = git_parse_maybe_bool(value);
> > > if (v >= 0)
> > > info->rebase = v;
> > > @@ -315,6 +319,10 @@ static int config_read_branches(const char *key, const char *value, void *cb)
> > > info->rebase = REBASE_MERGES;
> > > else if (!strcmp(value, "interactive"))
> > > info->rebase = INTERACTIVE_REBASE;
> > > + } else {
> > > + if (info->push_remote_name)
> > > + warning(_("more than one %s"), orig_key);
> > > + info->push_remote_name = xstrdup(value);
> >
> > It makes me a bit nervous that this is an `else` without an `if (type ==
> > PUSH_REMOTE)`... Maybe do that, just to be on the safe side, even if
> > another type is introduced in the future?
>
> I'm not a friend of this last 'else' either, but it was so to begin
> with. I'm all for changing it to an 'else if'. Though while it is
> impossible that 'type' has a value different than one from the enum, I
> would be even more comfortable with having BUG at the end.
My thinking was: even if this was a bare `else` before, why not fix that
issue while we're already in the area? I like the `BUG` idea.
Ciao,
Dscho
next prev parent reply other threads:[~2020-01-17 13:30 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 21:25 [PATCH] remote: rename also remotes in the branch.<name>.pushRemote config Bert Wesarg
2020-01-16 23:14 ` Junio C Hamano
2020-01-17 9:33 ` [PATCH v2] remote rename: rename branch.<name>.pushRemote config values too Bert Wesarg
2020-01-17 11:50 ` Johannes Schindelin
2020-01-17 12:37 ` Bert Wesarg
2020-01-17 13:30 ` Johannes Schindelin [this message]
2020-01-17 14:40 ` Bert Wesarg
2020-01-20 11:25 ` Johannes Schindelin
2020-01-20 13:14 ` Bert Wesarg
2020-01-20 13:51 ` Johannes Schindelin
2020-01-17 18:48 ` Junio C Hamano
2020-01-17 20:20 ` Bert Wesarg
2020-01-17 21:24 ` Junio C Hamano
2020-01-21 9:24 ` [PATCH 0/7] remote rename: improve handling of configuration values Bert Wesarg
2020-01-21 9:24 ` [PATCH 1/7] pull --rebase/remote rename: document and honor single-letter abbreviations rebase types Bert Wesarg
2020-01-21 23:26 ` Junio C Hamano
2020-01-22 7:34 ` Bert Wesarg
2020-01-22 19:43 ` Junio C Hamano
2020-01-21 9:24 ` [PATCH 2/7] remote: clean-up by returning early to avoid one indentation Bert Wesarg
2020-01-23 23:02 ` Junio C Hamano
2020-01-21 9:24 ` [PATCH 3/7] remote: clean-up config callback Bert Wesarg
2020-01-21 9:24 ` [PATCH v3 4/7] remote rename: rename branch.<name>.pushRemote config values too Bert Wesarg
2020-01-21 9:24 ` [PATCH 5/7] [RFC] config: make `scope_name` global as `config_scope_name` Bert Wesarg
2020-01-22 0:12 ` Matt Rogers
2020-01-22 7:37 ` Bert Wesarg
2020-01-23 1:30 ` Matt Rogers
2020-01-21 9:24 ` [PATCH 6/7] config: provide access to the current line number Bert Wesarg
2020-01-21 9:24 ` [PATCH 7/7] remote rename: gently handle remote.pushDefault config Bert Wesarg
2020-01-23 23:03 ` Junio C Hamano
2020-01-24 8:49 ` Bert Wesarg
2020-01-22 15:26 ` [PATCH 0/7] remote rename: improve handling of configuration values Bert Wesarg
2020-01-17 9:49 ` [PATCH] remote: rename also remotes in the branch.<name>.pushRemote config Johannes Schindelin
2020-01-17 9:45 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2001171428170.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).