Hello,
On Thu, Aug 8, 2019 at 10:07 PM Phil Hord wrote:
>
> The issue of deadnaming aside, turning on log.mailmap by default is
> the sensible thing to do given that other Git features already honor
> it that way. Having it ignored-by-default (but only sometimes) just
> adds confusion when a mai
more robust
mailmap replacement down the line, because that is going to require
more careful consideration.
> On Thu, Aug 08, 2019 at 09:34:15PM -0400, Ariadne Conill wrote:
> > Hello,
> >
> > On August 8, 2019 8:13:15 PM EDT, Taylor Blau wrote:
> > >Hi Junio,
> > &
Hello,
On August 8, 2019 8:13:15 PM EDT, Taylor Blau wrote:
>Hi Junio,
>
>On Thu, Jul 25, 2019 at 05:19:23PM -0700, Junio C Hamano wrote:
>> Here are the topics that have been cooking. Commits prefixed with
>> '-' are only in 'pu' (proposed updates) while commits prefixed with
>> '+' are in 'nex
ate jun...@cox.net from my paged/interactive output, I
> want to eradicate it also in the output piped to the script I use
> for authorship stats.
>
> I suspect that you may have misread the "is interactive" bit in the
> original; that was used only to decide if we are going to war
Hello,
On Wed, Jul 31, 2019 at 10:21 PM Junio C Hamano wrote:
>
> Jeff King writes:
>
> > This seems OK to me, though I kind of wonder if anybody really wants
> > "auto". Unlike log.decorate, which changes the syntax, there is no real
> > reason to avoid mailmap when somebody else is parsing the
Hello,
On Wed, Jul 31, 2019 at 8:00 PM Jeff King wrote:
>
> On Wed, Jul 31, 2019 at 05:21:25PM -0700, Jonathan Nieder wrote:
>
> > Although as Dscho mentions, it's particularly irritating because it is
> > not part of the paginated output.
> >
> > I wonder if the ideal might not be to trigger it
og.mailmap is set to "true" system-side, I can set it to "auto" in my
> per-user configuration).
This sounds like a great compromise, but honestly we should just flip
the default. I can't think of any situation where the non-mapped
author lines wouldn't be the
that we do this in the setup function.
Signed-off-by: Ariadne Conill
---
t/t7006-pager.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 00e09a375c..7976fa7bcc 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -7,6 +7,8 @@ test_description
lling terminal.
- Tests which fake a controlling terminal have been defanged.
Ariadne Conill (3):
log: add warning for unspecified log.mailmap setting
documentation: mention --no-use-mailmap and log.mailmap false setting
tests: defang pager tests by explicitly disabling the log.mailmap
wa
Based on discussions around changing the log.mailmap default to being
enabled, it was decided that a transitional period is required.
Accordingly, we announce this transitional period with a warning
message.
Signed-off-by: Ariadne Conill
---
builtin/log.c | 26 --
1
well as briefly discuss the equivalence of it to log.mailmap=False.
Signed-off-by: Ariadne Conill
---
Documentation/config/log.txt | 3 ++-
Documentation/git-log.txt| 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
In the previous patch, we added a deprecation warning for the current
log.mailmap setting. This warning only appears when git is attached to
a controlling terminal. Some tests however run under an emulated
terminal, so we need to disable the warning for those tests.
Signed-off-by: Ariadne Conill
Based on discussions around changing the log.mailmap default to being
enabled, it was decided that a transitional period is required.
Accordingly, we announce this transitional period with a warning
message.
Signed-off-by: Ariadne Conill
---
builtin/log.c | 25 -
1 file
well as briefly discuss the equivalence of it to log.mailmap=False.
Signed-off-by: Ariadne Conill
---
Documentation/config/log.txt | 3 ++-
Documentation/git-log.txt| 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
proceed.
New in version 2:
- The warning is disabled when `--format` is used.
- The warning is disabled when not called from a controlling terminal.
- Tests which fake a controlling terminal have been defanged.
Ariadne Conill (3):
log: add warning for unspecified log.mailmap setting
Hello,
On Fri, Jul 12, 2019 at 12:50 PM Junio C Hamano wrote:
>
> Ariadne Conill writes:
>
> > Based on the discussion of the previous patches, we concluded that
> > changing the default will require a transitional period.
>
> OK.
>
> > As such, I have intr
Hello,
On Fri, Jul 12, 2019 at 9:49 AM Junio C Hamano wrote:
>
> Junio C Hamano writes:
>
> > I do not think we usually do this without having to say "at this
> > release" in such a warning.
>
> Sorry for horrible copy-editing that made the result say 100%
> opposite of what I meant. I am bad a
Based on discussions around changing the log.mailmap default to being
enabled, it was decided that a transitional period is required.
Accordingly, we announce this transitional period with a warning
message.
Signed-off-by: Ariadne Conill
---
builtin/log.c | 17 -
1 file changed
proceed.
Ariadne Conill (2):
log: add warning for unspecified log.mailmap setting
documentation: mention --no-use-mailmap and log.mailmap false setting
Documentation/config/log.txt | 3 ++-
Documentation/git-log.txt| 2 +-
builtin/log.c| 17 -
3 files
well as briefly discuss the equivalence of it to log.mailmap=False.
Signed-off-by: Ariadne Conill
---
Documentation/config/log.txt | 3 ++-
Documentation/git-log.txt| 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
Hello,
On Thu, Jul 11, 2019 at 2:34 PM Junio C Hamano wrote:
>
> Junio C Hamano writes:
>
> > Even though I personally think it is an OK longer-term end goal, the
> > execution looks too hasty. The normal way we handle a big behaviour
> > change like this is to do the following in steps, in dif
by default or by the
configuration.
The previously undocumented --no-use-mailmap option equalizes this
by allowing the user to explicitly enable or disable the mailmap
feature according to their requirements.
Signed-off-by: Ariadne Conill
---
Documentation/config/log.txt | 4 ++--
Documentation
New in version 2:
- The `--no-use-mailmap` option, which complements `--use-mailmap`.
- Tests for `--no-use-mailmap`.
Ariadne Conill (3):
log: use mailmap by default
log: document --no-use-mailmap option
tests: rework mailmap tests for git log
Documentation/config/log.txt
have that change (recorded in mailmap file)
reflected when using `git log` by default.
Anyone who explicitly wants the current behaviour can clearly request
it by setting the `log.mailmap` setting to `false` in their
`.gitconfig` file.
Signed-off-by: Ariadne Conill
---
builtin/log.c | 2 +-
1 file
from the tests, since they are
redundant. We also rework some tests to explicitly define the
log.mailmap variable in both true and false states.
Signed-off-by: Ariadne Conill
---
t/t4203-mailmap.sh | 49 ++
1 file changed, 41 insertions(+), 8
Hello,
On Thu, Jul 11, 2019 at 1:24 PM Beat Bolli wrote:
>
> On 11.07.19 19:26, Ariadne Conill wrote:
> > When mailmap is enabled by default or by configuration, it may be
> > useful to override the default behaviour. Previously, it was
> > possible to enable the mai
have that change (recorded in mailmap file)
reflected when using `git log` by default.
Anyone who explicitly wants the current behaviour can clearly request
it by setting the `log.mailmap` setting to `false` in their
`.gitconfig` file.
Signed-off-by: Ariadne Conill
---
builtin/log.c | 2 +-
1 file
ommit messages.
New in version 2:
- The `--no-use-mailmap` option, which complements `--use-mailmap`.
- Tests for `--no-use-mailmap`.
Ariadne Conill (3):
log: use mailmap by default
log: add --no-use-mailmap option to complement --use-mailmap option
tests: rework mailmap tests for gi
from the tests, since they are
redundant. We also rework some tests to explicitly define the
log.mailmap variable in both true and false states.
Signed-off-by: Ariadne Conill
---
t/t4203-mailmap.sh | 49 ++
1 file changed, 41 insertions(+), 8
by default or by the
configuration.
The --no-use-mailmap option equalizes this by allowing the user to
explicitly enable or disable the mailmap feature according to their
requirements.
Signed-off-by: Ariadne Conill
---
Documentation/git-log.txt | 5 +
builtin/log.c | 1 +
2
Hello,
On Thu, Jul 11, 2019 at 12:09 PM Martin Ågren wrote:
>
> Hi Ariadne,
>
> Welcome to the list!
Thanks!
> On Thu, 11 Jul 2019 at 18:39, Ariadne Conill wrote:
> >
> > Hello,
> >
> > On Thu, Jul 11, 2019 at 10:19 AM brian m. carlson
> >
Hello,
On Thu, Jul 11, 2019 at 12:32 PM Beat Bolli wrote:
>
> On 11.07.19 19:26, Ariadne Conill wrote:
> > In order to prove that the --no-use-mailmap option works as expected,
> > we add a test for it which runs with -Dlog.mailmap=true to ensure that
>
> s/-D/
by default or by the
configuration.
The --no-use-mailmap option equalizes this by allowing the user to
explicitly enable or disable the mailmap feature according to their
requirements.
Signed-off-by: Ariadne Conill
---
Documentation/git-log.txt | 5 +
builtin/log.c | 1 +
2
In order to prove that the --no-use-mailmap option works as expected,
we add a test for it which runs with -Dlog.mailmap=true to ensure that
the option successfully negates the configured default.
Signed-off-by: Ariadne Conill
---
t/t4203-mailmap.sh | 8
1 file changed, 8 insertions
have that change (recorded in mailmap file)
reflected when using `git log` by default.
Anyone who explicitly wants the current behaviour can clearly request
it by setting the `log.mailmap` setting to `false` in their
`.gitconfig` file.
Signed-off-by: Ariadne Conill
---
builtin/log.c | 2 +-
1 file
known contact information for a
contributor, allowing anyone to contact the contributor about their
patches in the future.
New in version 2:
- The `--no-use-mailmap` option, which complements `--use-mailmap`.
- Tests for `--no-use-mailmap`.
Ariadne Conill (3):
log: use mailmap by default
log
Hello,
On Thu, Jul 11, 2019 at 10:19 AM brian m. carlson
wrote:
>
> On 2019-07-11 at 08:19:58, Ariadne Conill wrote:
> > The `git log` command shows the author and committer name recorded in
> > the git repository itself, while other commands respect `.mailmap`
> > by def
have that change (recorded in mailmap file)
reflected when using `git log` by default.
Anyone who explicitly wants the current behaviour can clearly request
it by setting the `log.mailmap` setting to `false` in their
`.gitconfig` file.
Signed-off-by: Ariadne Conill
---
builtin/log.c | 2 +-
1 file
38 matches
Mail list logo
