* Re: Bug: duplicate sections in .git/config after remote removal
2018-03-27 21:49 ` Ævar Arnfjörð Bjarmason
@ 2018-03-28 7:54 ` Philip Oakley
2018-03-28 7:54 ` Philip Oakley
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Philip Oakley @ 2018-03-28 7:54 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason, Jason Frey; +Cc: git, Stefan Beller
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
> On Tue, Mar 27 2018, Jason Frey wrote:
>
>> While the impact of this bug is minimal, and git itself is not
>> affected, it can affect external tools that want to read the
>> .git/config file, expecting unique section names.
>>
>> To reproduce:
>>
>> Given the following example .git/config file (I am leaving out the
>> [core] section for brevity):
>>
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>> remote = origin
>> merge = refs/heads/master
>>
>> Running `git remote rm origin` will result in the following contents:
>>
>> [branch "master"]
>>
>> Running `git remote add origin git@github.com:Fryguy/example.git` will
>> result in the following contents:
>>
>> [branch "master"]
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>>
>> And finally, running `git fetch origin; git branch -u origin/master`
>> will result in the following contents:
>>
>> [branch "master"]
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>> remote = origin
>> merge = refs/heads/master
>>
>> at which point you can see the duplicate sections (even though one is
>> empty). Also note that if you do the steps again, you will be left
>> with 3 sections, 2 of which are empty. This process can be repeated
>> over and over.
>
> This can be annoying and result in some very verbose config files when
> we automatically edit them, e.g.:
>
> (rm -v /tmp/test.ini; for i in {1..3}; do git config -f /tmp/test.ini
> foo.bar 0 && git config -f /tmp/test.ini --unset foo.bar; done; cat
> /tmp/test.ini)
> removed '/tmp/test.ini'
> [foo]
> [foo]
> [foo]
>
> But it's not so clear that it should be called a bug, yes we could be a
> bit smarter and not add obvious crap like the example above (duplicate
> sections at the end), but it gets less obvious in more complex cases,
> see my c8b2cec09e ("branch: add test for -m renaming multiple config
> sections", 2017-06-18) for one such example.
>
> Git has a config format that's hybrid human/machine editable. Consider a
> case like:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> ;; Our aliases
> [alias]
> st = status
>
> Now, if I run `git config gc.auto 0` is it better if we end up with:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> auto = 0
> ;; Our aliases
> [alias]
> st = status
>
> Or something that makes it more clear that a machine added something at
> the end:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> ;; Our aliases
> [alias]
> st = status
> [gc]
> auto = 0
>
> Most importantly though, regardless of what we decide to do when we
> machine-edit the file, it's also human-editable, and being able to
> repeat sections is part of our config format that you're simply going to
> have to deal with.
One option may be to create a simple 'lint' style checker that simply
hiughlights and suggests options so the user can decide for themselves what
they need to do. This would help span the gap between hard format and the
soft format capabiulities of machine readable ini files, the Git config
reader and being human readable.
Thus duplicate sections would be noted, likewise the presence of comments
immediately preceding a section header, or terminating a section (with or
without spacing?), etc.Such a config_lint could reside in the contrib as a
supprt tool, and may in the long term be a guide to a common format.
However, as noted, it would be more of a long term aspiration..
>
> The external tool (presumably some generic *.ini parser) you're trying
> to point at git's config is broken for that purpose if it doesn't handle
> duplicate sections. You're probably better off trying to parse `git
> config --list --null` than trying to make it work.
>
> I don't think we'd ever want to get rid of this feature, it's *very*
> useful. Both for config via the include macro, and for people to
> manually paste some config they want to try out to the end of their
> config, without having to manually edit it to incorporate it into their
> already existing sections.
>
--
Philip
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: Bug: duplicate sections in .git/config after remote removal
2018-03-27 21:49 ` Ævar Arnfjörð Bjarmason
2018-03-28 7:54 ` Philip Oakley
@ 2018-03-28 7:54 ` Philip Oakley
2018-03-28 7:55 ` Philip Oakley
2018-03-28 8:06 ` Philip Oakley
3 siblings, 0 replies; 8+ messages in thread
From: Philip Oakley @ 2018-03-28 7:54 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason, Jason Frey; +Cc: git, Stefan Beller
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
> On Tue, Mar 27 2018, Jason Frey wrote:
>
>> While the impact of this bug is minimal, and git itself is not
>> affected, it can affect external tools that want to read the
>> .git/config file, expecting unique section names.
>>
>> To reproduce:
>>
>> Given the following example .git/config file (I am leaving out the
>> [core] section for brevity):
>>
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>> remote = origin
>> merge = refs/heads/master
>>
>> Running `git remote rm origin` will result in the following contents:
>>
>> [branch "master"]
>>
>> Running `git remote add origin git@github.com:Fryguy/example.git` will
>> result in the following contents:
>>
>> [branch "master"]
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>>
>> And finally, running `git fetch origin; git branch -u origin/master`
>> will result in the following contents:
>>
>> [branch "master"]
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>> remote = origin
>> merge = refs/heads/master
>>
>> at which point you can see the duplicate sections (even though one is
>> empty). Also note that if you do the steps again, you will be left
>> with 3 sections, 2 of which are empty. This process can be repeated
>> over and over.
>
> This can be annoying and result in some very verbose config files when
> we automatically edit them, e.g.:
>
> (rm -v /tmp/test.ini; for i in {1..3}; do git config -f /tmp/test.ini
> foo.bar 0 && git config -f /tmp/test.ini --unset foo.bar; done; cat
> /tmp/test.ini)
> removed '/tmp/test.ini'
> [foo]
> [foo]
> [foo]
>
> But it's not so clear that it should be called a bug, yes we could be a
> bit smarter and not add obvious crap like the example above (duplicate
> sections at the end), but it gets less obvious in more complex cases,
> see my c8b2cec09e ("branch: add test for -m renaming multiple config
> sections", 2017-06-18) for one such example.
>
> Git has a config format that's hybrid human/machine editable. Consider a
> case like:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> ;; Our aliases
> [alias]
> st = status
>
> Now, if I run `git config gc.auto 0` is it better if we end up with:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> auto = 0
> ;; Our aliases
> [alias]
> st = status
>
> Or something that makes it more clear that a machine added something at
> the end:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> ;; Our aliases
> [alias]
> st = status
> [gc]
> auto = 0
>
> Most importantly though, regardless of what we decide to do when we
> machine-edit the file, it's also human-editable, and being able to
> repeat sections is part of our config format that you're simply going to
> have to deal with.
One option may be to create a simple 'lint' style checker that simply
hiughlights and suggests options so the user can decide for themselves what
they need to do. This would help span the gap between hard format and the
soft format capabiulities of machine readable ini files, the Git config
reader and being human readable.
Thus duplicate sections would be noted, likewise the presence of comments
immediately preceding a section header, or terminating a section (with or
without spacing?), etc.Such a config_lint could reside in the contrib as a
supprt tool, and may in the long term be a guide to a common format.
However, as noted, it would be more of a long term aspiration..
>
> The external tool (presumably some generic *.ini parser) you're trying
> to point at git's config is broken for that purpose if it doesn't handle
> duplicate sections. You're probably better off trying to parse `git
> config --list --null` than trying to make it work.
>
> I don't think we'd ever want to get rid of this feature, it's *very*
> useful. Both for config via the include macro, and for people to
> manually paste some config they want to try out to the end of their
> config, without having to manually edit it to incorporate it into their
> already existing sections.
>
--
Philip
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: Bug: duplicate sections in .git/config after remote removal
2018-03-27 21:49 ` Ævar Arnfjörð Bjarmason
2018-03-28 7:54 ` Philip Oakley
2018-03-28 7:54 ` Philip Oakley
@ 2018-03-28 7:55 ` Philip Oakley
2018-03-28 8:06 ` Philip Oakley
3 siblings, 0 replies; 8+ messages in thread
From: Philip Oakley @ 2018-03-28 7:55 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason, Jason Frey; +Cc: git, Stefan Beller
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
> On Tue, Mar 27 2018, Jason Frey wrote:
>
>> While the impact of this bug is minimal, and git itself is not
>> affected, it can affect external tools that want to read the
>> .git/config file, expecting unique section names.
>>
>> To reproduce:
>>
>> Given the following example .git/config file (I am leaving out the
>> [core] section for brevity):
>>
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>> remote = origin
>> merge = refs/heads/master
>>
>> Running `git remote rm origin` will result in the following contents:
>>
>> [branch "master"]
>>
>> Running `git remote add origin git@github.com:Fryguy/example.git` will
>> result in the following contents:
>>
>> [branch "master"]
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>>
>> And finally, running `git fetch origin; git branch -u origin/master`
>> will result in the following contents:
>>
>> [branch "master"]
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>> remote = origin
>> merge = refs/heads/master
>>
>> at which point you can see the duplicate sections (even though one is
>> empty). Also note that if you do the steps again, you will be left
>> with 3 sections, 2 of which are empty. This process can be repeated
>> over and over.
>
> This can be annoying and result in some very verbose config files when
> we automatically edit them, e.g.:
>
> (rm -v /tmp/test.ini; for i in {1..3}; do git config -f /tmp/test.ini
> foo.bar 0 && git config -f /tmp/test.ini --unset foo.bar; done; cat
> /tmp/test.ini)
> removed '/tmp/test.ini'
> [foo]
> [foo]
> [foo]
>
> But it's not so clear that it should be called a bug, yes we could be a
> bit smarter and not add obvious crap like the example above (duplicate
> sections at the end), but it gets less obvious in more complex cases,
> see my c8b2cec09e ("branch: add test for -m renaming multiple config
> sections", 2017-06-18) for one such example.
>
> Git has a config format that's hybrid human/machine editable. Consider a
> case like:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> ;; Our aliases
> [alias]
> st = status
>
> Now, if I run `git config gc.auto 0` is it better if we end up with:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> auto = 0
> ;; Our aliases
> [alias]
> st = status
>
> Or something that makes it more clear that a machine added something at
> the end:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> ;; Our aliases
> [alias]
> st = status
> [gc]
> auto = 0
>
> Most importantly though, regardless of what we decide to do when we
> machine-edit the file, it's also human-editable, and being able to
> repeat sections is part of our config format that you're simply going to
> have to deal with.
One option may be to create a simple 'lint' style checker that simply
hiughlights and suggests options so the user can decide for themselves what
they need to do. This would help span the gap between hard format and the
soft format capabiulities of machine readable ini files, the Git config
reader and being human readable.
Thus duplicate sections would be noted, likewise the presence of comments
immediately preceding a section header, or terminating a section (with or
without spacing?), etc.Such a config_lint could reside in the contrib as a
supprt tool, and may in the long term be a guide to a common format.
However, as noted, it would be more of a long term aspiration..
>
> The external tool (presumably some generic *.ini parser) you're trying
> to point at git's config is broken for that purpose if it doesn't handle
> duplicate sections. You're probably better off trying to parse `git
> config --list --null` than trying to make it work.
>
> I don't think we'd ever want to get rid of this feature, it's *very*
> useful. Both for config via the include macro, and for people to
> manually paste some config they want to try out to the end of their
> config, without having to manually edit it to incorporate it into their
> already existing sections.
>
--
Philip
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: Bug: duplicate sections in .git/config after remote removal
2018-03-27 21:49 ` Ævar Arnfjörð Bjarmason
` (2 preceding siblings ...)
2018-03-28 7:55 ` Philip Oakley
@ 2018-03-28 8:06 ` Philip Oakley
3 siblings, 0 replies; 8+ messages in thread
From: Philip Oakley @ 2018-03-28 8:06 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason, Jason Frey
Cc: Git List, Stefan Beller
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
> On Tue, Mar 27 2018, Jason Frey wrote:
>
>> While the impact of this bug is minimal, and git itself is not
>> affected, it can affect external tools that want to read the
>> .git/config file, expecting unique section names.
>>
>> To reproduce:
>>
>> Given the following example .git/config file (I am leaving out the
>> [core] section for brevity):
>>
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>> remote = origin
>> merge = refs/heads/master
>>
>> Running `git remote rm origin` will result in the following contents:
>>
>> [branch "master"]
>>
>> Running `git remote add origin git@github.com:Fryguy/example.git` will
>> result in the following contents:
>>
>> [branch "master"]
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>>
>> And finally, running `git fetch origin; git branch -u origin/master`
>> will result in the following contents:
>>
>> [branch "master"]
>> [remote "origin"]
>> url = git@github.com:Fryguy/example.git
>> fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>> remote = origin
>> merge = refs/heads/master
>>
>> at which point you can see the duplicate sections (even though one is
>> empty). Also note that if you do the steps again, you will be left
>> with 3 sections, 2 of which are empty. This process can be repeated
>> over and over.
>
> This can be annoying and result in some very verbose config files when
> we automatically edit them, e.g.:
>
> (rm -v /tmp/test.ini; for i in {1..3}; do git config -f /tmp/test.ini
> foo.bar 0 && git config -f /tmp/test.ini --unset foo.bar; done; cat
> /tmp/test.ini)
> removed '/tmp/test.ini'
> [foo]
> [foo]
> [foo]
>
> But it's not so clear that it should be called a bug, yes we could be a
> bit smarter and not add obvious crap like the example above (duplicate
> sections at the end), but it gets less obvious in more complex cases,
> see my c8b2cec09e ("branch: add test for -m renaming multiple config
> sections", 2017-06-18) for one such example.
>
> Git has a config format that's hybrid human/machine editable. Consider a
> case like:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> ;; Our aliases
> [alias]
> st = status
>
> Now, if I run `git config gc.auto 0` is it better if we end up with:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> auto = 0
> ;; Our aliases
> [alias]
> st = status
>
> Or something that makes it more clear that a machine added something at
> the end:
>
> [gc]
> ;; Here's all the gc config we set up to avoid the great outage of 2015
> autoDetach = false
> ;; Our aliases
> [alias]
> st = status
> [gc]
> auto = 0
>
> Most importantly though, regardless of what we decide to do when we
> machine-edit the file, it's also human-editable, and being able to
> repeat sections is part of our config format that you're simply going to
> have to deal with.
One option may be to create a simple 'lint' style checker that simply
hiughlights and suggests options so the user can decide for themselves what
they need to do. This would help span the gap between hard format and the
soft format capabiulities of machine readable ini files, the Git config
reader and being human readable.
Thus duplicate sections would be noted, likewise the presence of comments
immediately preceding a section header, or terminating a section (with or
without spacing?), etc.Such a config_lint could reside in the contrib as a
supprt tool, and may in the long term be a guide to a common format.
However, as noted, it would be more of a long term aspiration..
>
> The external tool (presumably some generic *.ini parser) you're trying
> to point at git's config is broken for that purpose if it doesn't handle
> duplicate sections. You're probably better off trying to parse `git
> config --list --null` than trying to make it work.
>
> I don't think we'd ever want to get rid of this feature, it's *very*
> useful. Both for config via the include macro, and for people to
> manually paste some config they want to try out to the end of their
> config, without having to manually edit it to incorporate it into their
> already existing sections.
>
--
Philip
^ permalink raw reply [flat|nested] 8+ messages in thread