When applying multiple patches with git am, or when rebasing using the
am backend, it's possible that one of our patches has updated a
gitattributes file. Currently, we cache this information, so if a
file in a subsequent patch has attributes applied, the file will be
written out with the attribute
Hi brian,
On Fri, Aug 09, 2019 at 10:02:17AM +, brian m. carlson wrote:
> When applying multiple patches with git am, or when rebasing using the
> am backend, it's possible that one of our patches has updated a
> gitattributes file. Currently, we cache this information, so if a
> file in a sub
Hi Jadian,
On Fri, Aug 09, 2019 at 12:31:12AM -0500, Jadian Radiator wrote:
> Git For Windows' installer can't see my Atom installation.
> I got Atom directly from Atom's official site.
This is the Git mailing list, which does not answers questions about Git
for Windows, or Atom, both of which ar
Hi Ariadne,
On Thu, Aug 08, 2019 at 10:21:02PM -0500, Ariadne Conill wrote:
> 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 tha
disregard this version, it still broken (and wouldn't even build on
some cases), the reasons why are still unclear though but at least it
might
seem from the last known run in windows that segfaults were prevented
at last and something was still off enough to trigger a BUG (shouldn't
be a concern w
On 2019-08-09 at 11:14:52, Taylor Blau wrote:
> > diff --git a/apply.c b/apply.c
> > index cde95369bb..b959b88b8e 100644
> > --- a/apply.c
> > +++ b/apply.c
> > @@ -4643,6 +4643,7 @@ static int apply_patch(struct apply_state *state,
> > struct patch *list = NULL, **listp = &list;
> > int sk
On Fri, Aug 09, 2019 at 11:25:52AM +, brian m. carlson wrote:
> > > + if (!flush_attributes && patch->new_name) {
> > > + char *dummy =
> > > strip_path_suffix(patch->new_name, GITATTRIBUTES_FILE);
> >
> > It's a shame that 'strip_path_suffix' doesn't
On Thu, Aug 08, 2019 at 08:07:36PM -0700, Phil Hord wrote:
> The long form you give there is to be used in case the old email
> address is not a unique key. See 'git help shortlog'.
>
> The problem we have at work is that one woman's old email address
> includes her deadname, like . I will
> lea
On 2019-08-09 at 11:36:14, Jeff King wrote:
> I think you could do this with:
>
> size_t len;
> if (strip_suffix(patch->new_name, GITATTRIBUTES_FILE, &len) &&
> len > 0 && is_dir_sep(patch->new_name[len-1]))
> flush_attributes = 1;
>
> Not sure if that is better or worse. It a
On Fri, Aug 09, 2019 at 07:36:14AM -0400, Jeff King wrote:
> On Fri, Aug 09, 2019 at 11:25:52AM +, brian m. carlson wrote:
>
> > > > + if (!flush_attributes && patch->new_name) {
> > > > + char *dummy =
> > > > strip_path_suffix(patch->new_n
On Fri, Aug 09, 2019 at 02:43:18PM +0200, SZEDER Gábor wrote:
> > I think you could do this with:
> >
> > size_t len;
> > if (strip_suffix(patch->new_name, GITATTRIBUTES_FILE, &len) &&
> > len > 0 && is_dir_sep(patch->new_name[len-1]))
> > flush_attributes = 1;
> >
> > Not su
On 01 Aug 2019 13:05:12, Junio wrote:
> >> *snip*
I think this got missed in the shuffle, but I am getting questions about the
topic from my own team that I cannot answer.
I noticed that the switch and restore commands are now available in 2.23.0 but
are not discussed in recent What's Cooking o
On 8/8/19 3:23 AM, Junio C Hamano wrote:
Pratyush Yadav writes:
I think you misunderstood me. I do not mean to create a GitHub pull
request, because as you say, no one other than me and you will look at
it. What I meant was that I can pile up a bunch of commits, and send
them on this list here
From: Jeff Hostetler
Avoid unecessary trailing whitespace in "region_enter" and "region_leave"
messages in perf target format.
Signed-off-by: Jeff Hostetler
---
trace2/tr2_tgt_perf.c | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/trace2/tr2_tgt_perf.c b/tra
From: Jeff Hostetler
Remove an unnecessary "if" block in maybe_add_string_va().
Commit "ad006fe419e trace2: NULL is not allowed for va_list"
changed "if (fmt && *fmt && ap)" to just "if (fmt && *fmt)"
because it isn't safe to treat 'ap' as a pointer. This made
the "if" block following it unnece
From: Jeff Hostetler
Make use of new sq_append_quote_argv_pretty() to normalize
how we handle leading whitespace in perf format messages.
Signed-off-by: Jeff Hostetler
---
t/t0211-trace2-perf.sh | 4 ++--
trace2/tr2_tgt_perf.c | 31 ---
2 files changed, 22 inserti
From: Jeff Hostetler
Make use of new sq_append_quote_argv_pretty() to normalize
how we handle leading whitespace in normal format messages.
Signed-off-by: Jeff Hostetler
---
trace2/tr2_tgt_normal.c | 23 +--
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/tr
From: Jeff Hostetler
Avoid creating unnecessary trailing whitespace in normal
target format error messages when the message is omitted.
Signed-off-by: Jeff Hostetler
---
trace2/tr2_tgt_normal.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/trace2/tr2_tgt_normal.c b
V2 of this patch series cleans up some whitespace and column alignment
issues in the trace2 perf and normal formats. It also removes some dead
code.
Jeff Hostetler (7):
trace2: cleanup column alignment in perf target format
trace2: trim whitespace in region messages in perf target format
tra
From: Jeff Hostetler
sq_quote_argv_pretty() builds a "pretty" string from the given argv.
It inserts whitespace before each value, rather than just between
them, so the resulting string always has a leading space. Lets give
callers an option to not have the leading space or have to ltrim()
it la
From: Jeff Hostetler
Truncate/elide very long "filename:linenumber" field.
Truncate region and data "category" field if necessary.
Adjust overall column widths.
Signed-off-by: Jeff Hostetler
---
trace2/tr2_tgt_perf.c | 39 +--
1 file changed, 29 insertions(+
After correcting spelling of renormalize, the end result of the script you gave
is that line endings in working directory are CRLF, and in the repo are LF.
Is that expected? Surprising? Not sure what you were trying to test there. I
also fixed my script to use printf, new version is:
(using co
On Fri, Aug 09, 2019 at 10:06:06AM -0400, Randall S. Becker wrote:
> On 01 Aug 2019 13:05:12, Junio wrote:
> > >> *snip*
>
> I think this got missed in the shuffle, but I am getting questions about the
> topic from my own team that I cannot answer.
>
> I noticed that the switch and restore comm
On August 9, 2019 12:29 PM, Jeff King wrote:
> On Fri, Aug 09, 2019 at 10:06:06AM -0400, Randall S. Becker wrote:
>
> > On 01 Aug 2019 13:05:12, Junio wrote:
> > > >> *snip*
> >
> > I think this got missed in the shuffle, but I am getting questions about the
> topic from my own team that I cannot
Junio C Hamano writes:
> ... If anything,
> perhaps such a description should go to "git help revisions", as it
> is not just "blame" but "log". "The dots notation is not about
> date-based cutoff, unlike the --since/--until options" is shared by
> all history traversal tools.
By this, I do not
Am 09.08.19 um 13:24 schrieb Carlo Arenas:
> disregard this version, it still broken (and wouldn't even build on
> some cases), the reasons why are still unclear though but at least it
> might
> seem from the last known run in windows that segfaults were prevented
> at last and something was still
On 8/8/2019 6:49 PM, René Scharfe wrote:
Am 08.08.19 um 21:04 schrieb Jeff Hostetler:
On 8/8/2019 2:05 PM, Junio C Hamano wrote:
Having made the primary purpose of the helper clearer leads me to
wonder if "do not add SP before the first element, i.e. argv[0]", is
really what we want. If we
On Fri, Aug 9, 2019 at 4:41 AM Jeff King wrote:
>
> On Thu, Aug 08, 2019 at 08:07:36PM -0700, Phil Hord wrote:
>
> > The long form you give there is to be used in case the old email
> > address is not a unique key. See 'git help shortlog'.
> >
> > The problem we have at work is that one woman's ol
"Randall S. Becker" writes:
> On 01 Aug 2019 13:05:12, Junio wrote:
>> >> *snip*
>
> I think this got missed in the shuffle, but I am getting questions
> about the topic from my own team that I cannot answer.
>
> I noticed that the switch and restore commands are now available
> in 2.23.0 but are
Jeff King writes:
> I don't know of any plans for checkout in particular, but I think the
> docs for restore/switch make it clear that it's way too early to start
> scripting around them:
>
> $ git grep EXPERIMENTAL Documentation/
> Documentation/git-restore.txt:THIS COMMAND IS EXPERIMENTAL.
René Scharfe writes:
> So how about starting stupidly simple? You can test it everywhere, it
> just needs libpcre2. It works without that library as well (tested with
> "make USE_LIBPCRE= USE_LIBPCRE2= test"), but doesn't allocate anything
> in that case, of course. The character tables leak f
"Jeff Hostetler via GitGitGadget" writes:
> +/*
> + * Legacy function to append each argv value, quoted as necessasry,
> + * with whitespace before each value. This results in a leading
> + * space in the result.
> + */
> void sq_quote_argv_pretty(struct strbuf *dst, const char **argv)
> +{
> +
Am 09.08.19 um 19:13 schrieb Jeff Hostetler:
> On 8/8/2019 6:49 PM, René Scharfe wrote:
>> void sq_quote_argv_pretty(struct strbuf *dst, const char **argv)
>> {
>> - int i;
>> -
>> - for (i = 0; argv[i]; i++) {
>> - strbuf_addch(dst, ' ');
>> - sq_quote_buf_pretty(dst, argv[
On Fri, Aug 9, 2019 at 10:48 AM Junio C Hamano wrote:
>
> Jeff King writes:
>
> > I don't know of any plans for checkout in particular, but I think the
> > docs for restore/switch make it clear that it's way too early to start
> > scripting around them:
> >
> > $ git grep EXPERIMENTAL Documenta
Thanks. Will queue.
On 8/9/2019 1:54 PM, Junio C Hamano wrote:
"Jeff Hostetler via GitGitGadget" writes:
+/*
+ * Legacy function to append each argv value, quoted as necessasry,
+ * with whitespace before each value. This results in a leading
+ * space in the result.
+ */
void sq_quote_argv_pretty(struct st
On 08/08/2019 22:28, Emily Shaffer wrote:
On Thu, Aug 8, 2019 at 2:20 PM Bryan Turner wrote:
On Thu, Aug 8, 2019 at 2:08 PM wrote:
fwiw,
jimc@frodo:~/prj-1/capnproto.git$ git branch -l
* master
I find the splat in the response unhelpful
when wrapped in shell for loop, the splat expands into
On August 9, 2019 1:45 PM, Junio C Hamano wrote:
> "Randall S. Becker" writes:
>
> > On 01 Aug 2019 13:05:12, Junio wrote:
> >> >> *snip*
> >
> > I think this got missed in the shuffle, but I am getting questions
> > about the topic from my own team that I cannot answer.
> >
> > I noticed that th
A release candidate Git v2.23.0-rc2 is now available for testing
at the usual places. It is comprised of 483 non-merge commits
since v2.22.0, contributed by 67 people, 24 of which are new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following pu
Hello,
I have an open Git for Windows issue here:
https://github.com/git-for-windows/git/issues/2285
"git log" works as expected from the command prompt. But when I execute it via
C# Process class and read from Standard Output, the refs are missing.
Is anyone familiar with this issue? Any ide
On Fri, Aug 09, 2019 at 07:36:19PM +, Cliff Schomburg wrote:
> I have an open Git for Windows issue here:
> https://github.com/git-for-windows/git/issues/2285
>
> "git log" works as expected from the command prompt. But when I execute it
> via C# Process class and read from Standard Output,
Pratyush Yadav writes:
>> If you meant to volunteer to act as a git-gui maintainer, that would
>> be wonderful. Then I do not have to play an interim maintainer.
>
> Yes, I do mean to volunteer to act as a git-gui maintainer.
>
> Is there something I should know other than
> Documentation/howto/
Adding --decorate gave me the desired result.
Thanks for your help!
-Original Message-
From: SZEDER Gábor
Sent: Friday, August 9, 2019 3:51 PM
To: Cliff Schomburg
Cc: git@vger.kernel.org
Subject: Re: "git log" does not display refs info when executed via C# Process
class on Windows
O
Hi Carlo,
On Thu, 8 Aug 2019, Carlo Arenas wrote:
> PS. I might had broken something here as I can't see the test results
> that failed
> https://dev.azure.com/git/git/_build/results?buildId=857&view=ms.vss-test-web.build-test-results-tab
The test results load dynamically, so you'll probably jus
Thanks, Junio! will dig in.
On 12:29 Fri 09 Aug 2019, Junio C Hamano wrote:
A release candidate Git v2.23.0-rc2 is now available for testing
at the usual places. It is comprised of 483 non-merge commits
since v2.22.0, contributed by 67 people, 24 of which are new faces.
The tarballs are fo
On 12:29 Fri 09 Aug 2019, Junio C Hamano wrote:
> >A release candidate Git v2.23.0-rc2 is now available for testing at the
> >usual places. It is comprised of 483 non-merge commits since v2.22.0,
> >contributed by 67 people, 24 of which are new faces.
> >
> >The tarballs are found at:
> >
> >h
Hi,
On Fri, 9 Aug 2019, René Scharfe wrote:
> Am 09.08.19 um 13:24 schrieb Carlo Arenas:
> > disregard this version, it still broken (and wouldn't even build on
> > some cases), the reasons why are still unclear though but at least it
> > might
> > seem from the last known run in windows that se
Team,
On Fri, 9 Aug 2019, Junio C Hamano wrote:
> A release candidate Git v2.23.0-rc2 is now available for testing
> at the usual places. It is comprised of 483 non-merge commits
> since v2.22.0, contributed by 67 people, 24 of which are new faces.
>
> The tarballs are found at:
>
> https://
Strangely, when I run this command:
Git log origin/master --pretty=oneline --decorate -1
I get the format I want from STDOUT. However, when I try to filter it to show
only the tag refs:
Git log origin/master --pretty=oneline --decorate --decorate-refs=^tag* -1
No refs are returned to standard
Cliff Schomburg writes:
> Strangely, when I run this command:
>
> Git log origin/master --pretty=oneline --decorate -1
>
> I get the format I want from STDOUT. However, when I try to filter it to
> show only the tag refs:
>
> Git log origin/master --pretty=oneline --decorate --decorate-refs=^ta
On 2019-08-09 at 13:51:49, Jeff King wrote:
> On Fri, Aug 09, 2019 at 02:43:18PM +0200, SZEDER Gábor wrote:
> > But there is an other subtlety here: when I read the commit message
> > saying "patch that touches a path ending in ".gitattributes"." and saw
> > the new call to strip_path_suffix(), I i
Thanks, I will try that as well. Strange it works on command line but not
STDOUT though.
-Original Message-
From: Junio C Hamano
Sent: Friday, August 9, 2019 5:50 PM
To: Cliff Schomburg
Cc: SZEDER Gábor ; git@vger.kernel.org
Subject: Re: "git log" does not display refs info when execu
PDF.pdf
Description: Adobe PDF document
gabrielreyes...@gmail.com
Make using a general context (that is only needed with NED) to depend
on NED being selected at compile time.
the compile_context could be also make conditional but it gets ugly
really fasts with #ifdef
---
Makefile | 2 +-
grep.c | 4
2 files changed, 5 insertions(+), 1 deletion(-)
diff -
On Fri, Aug 9, 2019 at 2:26 PM Johannes Schindelin
wrote:
>
> FWIW I am very much in favor of this approach.
FWIW this is (almost) exactly what I had in mind with my first reply,
except I wanted to make setting of the global context be conditioned
to having NED enabled to avoid possible performan
From: Mark Rushakoff
Inspired by 21416f0a07 ("restore: fix typo in docs", 2019-08-03), I ran
"git grep -E '(\b[a-zA-Z]+) \1\b' -- Documentation/" to find other cases
where words were duplicated, e.g. "the the", and in most cases removed
one of the repeated words.
There were many false positives
Inspired by 21416f0a07 ("restore: fix typo in docs", 2019-08-03), I ran "git
grep -E '(\b[a-zA-Z]+) \1\b' -- Documentation/" to find other cases where
words were duplicated, e.g. "the the", and in most cases removed one of the
repeated words.
Mark Rushakoff (1):
doc: fix repeated words
Documen
On Fri, Aug 09, 2019 at 10:59:14PM -0700, Mark Rushakoff via GitGitGadget wrote:
> From: Mark Rushakoff
>
> Inspired by 21416f0a07 ("restore: fix typo in docs", 2019-08-03), I ran
> "git grep -E '(\b[a-zA-Z]+) \1\b' -- Documentation/" to find other cases
> where words were duplicated, e.g. "the
On Fri, Aug 09, 2019 at 11:05:34AM -0700, Phil Hord wrote:
> On Fri, Aug 9, 2019 at 10:48 AM Junio C Hamano wrote:
> >
> > Jeff King writes:
> >
> > > I don't know of any plans for checkout in particular, but I think the
> > > docs for restore/switch make it clear that it's way too early to star
60 matches
Mail list logo
