From: "Shawn O. Pearce" <spearce@spearce.org>
To: Jonas Fonseca <fonseca@diku.dk>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] When renaming config sections delete conflicting sections
Date: Tue, 16 Oct 2007 20:55:17 -0400 [thread overview]
Message-ID: <20071017005517.GJ13801@spearce.org> (raw)
In-Reply-To: <20071017003418.GA11013@diku.dk>
Jonas Fonseca <fonseca@diku.dk> wrote:
> The old behavior of keeping config sections matching the new name caused
> problems leading to warnings being emitted by git-remote when renaming
> branches where information about tracked remote branches differed. To
> fix this any config sections that will conflict with the new name are
> removed from the config file. Update test to check for this.
...
> This command sequence was causing problems for me:
>
> git checkout -b test madcoder/next
> git checkout -b test2 spearce/next
> git branch -M test
Ouch. But this may cause the user to lose what they might consider
important settings relative to the old section named branch.test.
I think in the case you mention above where you are doing a
`branch -M` the user really does want the basic branch properties
to be forced over (branch.$name.remote, branch.$name.merge) but
they probably do not want other branch properties to be removed
or deleted. Or maybe they do.
Its really hard to second guess the user's intent here. I think
its too broad to whack an entire section when renaming. For example
today lets say I do:
cat >.git/config <<EOF
[remote "many"]
url = blah
fetch = refs/heads/master
fetch = refs/heads/next
EOF
$ git config remote.many.fetch refs/heads/pu
Warning: remote.many.fetch has multiple values
cat .git/config
[remote "many"]
url = blah
fetch = refs/heads/master
fetch = refs/heads/next
So we don't blindly replace multi-valued keys just because the
user asked us to. I don't really see a section as being that much
different to warrant a potentially lossy behavior by default.
--
Shawn.
next prev parent reply other threads:[~2007-10-17 0:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-17 0:34 [PATCH] When renaming config sections delete conflicting sections Jonas Fonseca
2007-10-17 0:55 ` Shawn O. Pearce [this message]
2007-10-17 10:37 ` Jonas Fonseca
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=20071017005517.GJ13801@spearce.org \
--to=spearce@spearce.org \
--cc=fonseca@diku.dk \
--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.
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).