Re: [PATCH 2/3] stripspace: respect repository config
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Nov 22, 2016, 16:11 UTC
- Message-ID
- <alpine.DEB.2.20.1611221710470.3746@virtualbox>
- In-Reply-To
- <20161121190514.18574-2-gitster@pobox.com>
Hi Junio,
On Mon, 21 Nov 2016, Junio C Hamano wrote:
Show 26 quoted lines
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> The way "git stripspace" reads the configuration was not quite
> correct, in that it forgot to probe for a possibly existing
> repository (note: stripspace is designed to be usable outside the
> repository as well) before doing so. Due to this, .git/config was
> read only when the command was run from the top-level of the working
> tree.
>
> A recent change b9605bc4f2 ("config: only read .git/config from
> configured repos", 2016-09-12) stopped reading the repository-local
> configuration file ".git/config" unless the repository discovery
> process is done, and ".git/config" is no longer read even when run
> from the top-level, which exposed the bug even more.
>
> When rebasing interactively with a commentChar defined in the
> current repository's config, the help text at the bottom of the edit
> script potentially used an incorrect comment character. This was not
> only funny-looking, but also resulted in tons of warnings like this
> one:
>
> Warning: the command isn't recognized in the following line
> - #
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>Thanks for the corrected commit message! Dscho