Re: unclear docs

On Mon, Jan 28, 2019 at 01:31:17PM -0500, Jeff King wrote: > On Mon, Jan 28, 2019 at 09:12:00PM +0300, Sergey Lukashev wrote: > > > Thank you. Does the paragraph about core.eol refers to the text > > attribute? It's written 'property' there. I was thinking it means > > whether git thinks file is te

Re: What's cooking in git.git (Jan 2019, #04; Mon, 28)

On Mon, Jan 28, 2019 at 02:43:21PM -0800, Junio C Hamano wrote: > > * tb/utf-16-le-with-explicit-bom (2019-01-22) 1 commit > - Support working-tree-encoding "UTF-16LE-BOM" > > A new encoding UTF-16LE-BOM has been invented to force encoding to > UTF-16 with BOM in little endian byte order, whic

Re: [PATCH v5 2/7 update] pretty: allow %(trailers) options with explicit value

In addition to old %(trailers:only) it is now allowed to write %(trailers:only=yes) By itself this only gives (the not quite so useful) possibility to have users change their mind in the middle of a formatting string (%(trailers:only=true,only=false)). However, it gives users the opportunity to

Re: [PATCH v5 2/7] pretty: Allow %(trailers) options with explicit value

Junio C Hamano writes: >> ... >> +static int match_placeholder_bool_arg(const char *to_parse, const char >> *candidate, >> + const char **end, int *val) >> +{ >> +char buf[8]; >> +const char *strval; >> +size_t len; >> +int v; >> + >> +if (!m

[PATCH v3 2/3] Setup working tree in describe

This ensures the given working tree is used for --dirty. The implementation of --broken uses diff-index which calls setup_work_tree() itself. Signed-off-by: Sebastian Staudt --- builtin/describe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/describe.c b/builtin/describe.c index

[PATCH v3 3/3] Add test for describe with a bare repository

This ensures that nothing breaks the basic functionality of describe for bare repositories. Please note that --broken and --dirty need a working tree. Signed-off-by: Sebastian Staudt --- t/t6120-describe.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/t6120-describe.sh b/t/t6120-de

[PATCH v3 1/3] Add tests for describe with --work-tree

The dirty ones are already passing, but just because describe is comparing with the wrong working tree. Signed-off-by: Sebastian Staudt --- t/t6120-describe.sh | 33 + 1 file changed, 33 insertions(+) diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index d

[PATCH v4 5/5] Add `human` date format tests.

When using `human` several fields are suppressed depending on the time difference between the reference date and the local computer date. In cases where the difference is less than a year, the year field is supppressed. If the time is less than a day; the month and year is suppressed. Use TEST_DAT

[PATCH v4 0/5] Re-roll of 'human' date format patch set

Changed the binary and test to rename TEST_DATE_NOW environment variable. Changed the 'human' test to test_i18ncmp. Updates for the relative date format will be done in a follow-on patch. Range-diff relative to v3: 1: ee75d9002d = 1: ee75d9002d Add 'human' date format 2: 722c3319cd = 2: 722

[PATCH v4 4/5] Add `human` format to test-tool

Add the human format support to the test tool so that GIT_TEST_DATE_NOW can be used to specify the current time. The get_time() helper function was created and and checks the GIT_TEST_DATE_NOW environment variable. If GIT_TEST_DATE_NOW is set, then that date is used instead of the date returned b

[PATCH v4 3/5] Add 'human' date format documentation

Display date and time information in a format similar to how people write dates in other contexts. If the year isn't specified then, the reader infers the date is given is in the current year. By not displaying the redundant information, the reader concentrates on the information that is different

[PATCH v4 1/5] Add 'human' date format

From: Linus Torvalds This adds --date=human, which skips the timezone if it matches the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are "this year", but also skip the whole date itself if it's in the last few days and we can just say w

[PATCH v4 2/5] Replace the proposed 'auto' mode with 'auto:'

In addition to adding the 'human' format, the patch added the auto keyword which could be used in the config file as an alternate way to specify the human format. Removing 'auto' cleans up the 'human' format interface. Added the ability to specify mode 'foo' if the pager is being used by using au

Rodger Lilley sent you a business file via Microsoft OneDrive

Rodger Lilley sent you a business file via Microsoft OneDrive, to view open document below. Open Document Please call my secretary after viewing the files, her number is on the 4th page of the document. Best Regards Rodger Lilley Dir

Re: sparse job, was Re: [PATCH] test-xml-encode: fix sparse NULL pointer warnings

On 29/01/2019 01:52, Luc Van Oostenryck wrote: > On Mon, Jan 28, 2019 at 08:13:03PM +, Ramsay Jones wrote: > > Hi > >> The dependencies for the 'sparse' package includes: libc6 (>= 2.14), >> libllvm4.0 (>= 1:4.0~), libxml2 (>= 2.7.4), perl:any >> >> However, for git, we only need to build

Re: sparse job, was Re: [PATCH] test-xml-encode: fix sparse NULL pointer warnings

On Mon, Jan 28, 2019 at 08:13:03PM +, Ramsay Jones wrote: Hi > The dependencies for the 'sparse' package includes: libc6 (>= 2.14), > libllvm4.0 (>= 1:4.0~), libxml2 (>= 2.7.4), perl:any > > However, for git, we only need to build 'cgcc' and 'sparse', which > means we can forget about libxml

Re: sparse job, was Re: [PATCH] test-xml-encode: fix sparse NULL pointer warnings

(+cc: Uwe Kleine-König, maintainer of the sparse package in Debian) Hi, Ramsay Jones wrote[1]: > Hmm, I've never built an Ubuntu package before, so I don't know > exactly what would be required (spec file etc.) to create a PPA. > But I suspect you are not talking about doing that, right? Ubuntu

[PATCH v5 6/8] git-legacy-rebase: simplify unnecessary triply-nested if

The git-legacy-rebase.sh script previously had code of the form: if git_am_opt: if interactive: if incompatible_opts: show_error_about_interactive_and_am_incompatibilities if rebase-merge: if incompatible_opts show_error_about_merge_and_am_incompatibilities which was a tri

[PATCH v5 8/8] rebase: implement --merge via the interactive machinery

As part of an ongoing effort to make rebase have more uniform behavior, modify the merge backend to behave like the interactive one, by re-implementing it on top of the latter. Interactive rebases are implemented in terms of cherry-pick rather than the merge-recursive builtin, but cherry-pick also

[PATCH v5 3/8] t5407: add a test demonstrating how interactive handles --skip differently

The post-rewrite hook is documented as being invoked by commands that rewrite commits such as commit --amend and rebase, and that it will be called for each rewritten commit. Apparently, the three backends handled --skip'ed commits differently: am: treat the skipped commit as though it weren't r

[PATCH v5 7/8] rebase: define linearization ordering and enforce it

Ever since commit 3f213981e44a ("add tests for rebasing merged history", 2013-06-06), t3425 has had tests which included the rebasing of merged history and whose order of applied commits was checked. Unfortunately, the tests expected different behavior depending on which backend was in use. Imple

[PATCH v5 5/8] git-rebase, sequencer: extend --quiet option for the interactive machinery

While 'quiet' and 'interactive' may sound like antonyms, the interactive machinery actually has logic that implements several interactive_rebase=implied cases (--exec, --keep-empty, --rebase-merges) which won't pop up an editor. The rewrite of interactive rebase in C added a quiet option, though i

[PATCH v5 4/8] am, rebase--merge: do not overlook --skip'ed commits with post-rewrite

The post-rewrite hook is supposed to be invoked for each rewritten commit. The fact that a commit was selected and processed by the rebase operation (even though when we hit an error a user said it had no more useful changes), suggests we should write an entry for it. In particular, let's treat i

[PATCH v5 2/8] rebase: fix incompatible options error message

In commit f57696802c30 ("rebase: really just passthru the `git am` options", 2018-11-14), the handling of `git am` options was simplified dramatically (and an option parsing bug was fixed), but it introduced a small regression in the error message shown when options only understood by separate back

[PATCH v5 0/8] Reimplement rebase --merge via interactive machinery

This series continues the work of making rebase more self-consistent by removing inconsistencies between different backends. In particular, this series focuses on making the merge machinery behave like the interactive machinery (though a few differences between the am and interactive backends are

[PATCH v5 1/8] rebase: make builtin and legacy script error messages the same

The conversion of the script version of rebase took messages that were prefixed with "error:" and passed them along to die(), which adds a "fatal:" prefix, thus resulting in messages of the form: fatal: error: cannot combine... which seems redundant. Remove the "error:" prefix from the builtin

Re: [PATCH v2] checkout: print something when checking out paths

On Tue, Jan 29, 2019 at 4:58 AM Junio C Hamano wrote: > One small bug I saw since this was merged is that the message that > is given when unmerging, i.e. > > git merge other-branch ;# conflicts > git checkout --m > > is misleading. It gives the same "checked out ... out of the

Re: There should be a `.gitbless; file, protecting files from git clean

On Mon, Jan 28, 2019 at 10:30 PM Sebastian Gniazdowski wrote: > > > > On 28 stycznia 2019 at 06:05:31, Duy Nguyen (pclo...@gmail.com) wrote: > > There's a patch that adds "precious" git attribute [1]. I was going to > > resend once the backup-log [2] got reviewed but I might just send it > > separ

Re: There should be a `.gitbless; file, protecting files from git clean

On Mon, Jan 28, 2019 at 12:24 PM Sebastian Gniazdowski wrote: > > On 28 stycznia 2019 at 06:05:31, Duy Nguyen (pclo...@gmail.com) wrote: > > On Mon, Jan 28, 2019 at 9:54 AM Sebastian Gniazdowski > > wrote: > > > > > > Hello, > > > Could a .gitbless file be a solution? I would list in it, e.g.: > >

Re: [PATCH/RFC] completion: complete refs in multiple steps

On Tue, Jan 29, 2019 at 07:43:45AM +0700, Duy Nguyen wrote: > > > In general I think it would be much better to rely more on 'git > > > for-each-ref' to do the heavy lifting, extending it with new format > > > specifiers/options as necessary. > > > > FWIW, that was my first thought, too. > > I wa

Re: [PATCH/RFC] completion: complete refs in multiple steps

On Tue, Jan 29, 2019 at 12:27 AM Jeff King wrote: > > On Mon, Jan 28, 2019 at 03:38:28PM +0100, SZEDER Gábor wrote: > > > > - __gitcomp_direct "$(__git_refs "$remote" "$track" "$pfx" "$cur_" > > > "$sfx")" > > > + __gitcomp_direct "$(__git_refs "$remote" "$track" "$pfx" "$cur_" > > > "$sfx"

Re: sparse job, was Re: [PATCH] test-xml-encode: fix sparse NULL pointer warnings

On 28/01/2019 22:34, Johannes Schindelin wrote: > Hi Ramsay, > > On Mon, 28 Jan 2019, Ramsay Jones wrote: > >> Hmm, I've never built an Ubuntu package before, so I don't know >> exactly what would be required (spec file etc.) to create a PPA. >> But I suspect you are not talking about doing th

Re: [PATCH v2 1/2] config: allow giving separate author and committer idents

On Mon, Jan 28, 2019 at 09:04:15PM +0100, Ævar Arnfjörð Bjarmason wrote: > > Adjusting for limited time, I'm happy to help out with this series, > particularly if you have visual (screen reader) issues that make some of > this prohibitive for you. Just say what you need. I guess the best way to h

Re: [PATCH v3 5/8] evolve: Add the change-table structure

Sorry, folks. I normally can't do any open source work on weekdays. That also includes writing responses on the mailing list, so there will normally be a week or two lag for me to iterate on this sort of thing. Feel free to either include this fix or revert my patch if there's a problem with it -

Re: [PATCH v3 5/8] evolve: Add the change-table structure

Hi Junio, On Mon, 28 Jan 2019, Johannes Schindelin wrote: > On Sun, 27 Jan 2019, sxe...@google.com wrote: > > > + new_item->util = (void*)index; > > This is not good. You are using a `long` here. The 80s called and want > their now-obsolete data types back. > > If you want a data type that c

Re: [PATCH v4 03/21] ci/lib.sh: encapsulate Travis-specific things

Johannes Schindelin writes: > The big difference is that gettext is needed to build Git and run its test > suite. While gnu-time is only needed if you want to run the perf tests, > which is not a part of the CI configuration we have, neither Travis nor > Azure Pipelines. > > So as long as we do n

Re: [PATCH v4 03/21] ci/lib.sh: encapsulate Travis-specific things

Hi Junio, On Sun, 27 Jan 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > > No, not really. Actually, not at all. > > > >> It would be, under this new arrangement of the code, most natural for > >> Those who want to use gnu-time to arrange it to be somehow added to > >> $BREW_INSTA

Re: [PATCH v4 18/21] t0061: fix with --with-dashes and RUNTIME_PREFIX

Johannes Schindelin writes: >> Two questions that would come to the readers' minds are >> >> - Why "it fails to detect the system prefix correctly"? Is that a >>bug waiting to hurt end users? > > I recall explaining that already in a different thread (one that actually > *was* about the RU

Re: [PATCH v4 18/21] t0061: fix with --with-dashes and RUNTIME_PREFIX

Hi Junio, On Sun, 27 Jan 2019, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > From: Johannes Schindelin > > > > When building Git with RUNTIME_PREFIX and starting a test helper from > > t/helper/, it fails to detect the system prefix correctly. > > > > This is t

What's cooking in git.git (Jan 2019, #04; Mon, 28)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. If everything goes according to th

Re: [PATCH v5 2/7] pretty: Allow %(trailers) options with explicit value

Anders Waldenborg writes: > Subject: Re: [PATCH v5 2/7] pretty: Allow %(trailers) options with explicit > value Style: s/pretty: Allow/pretty: allow/ (haven't I said this often enough?) > +** 'only[=val]': select whether non-trailer lines from the trailer > + block should be included. The `o

Re: sparse job, was Re: [PATCH] test-xml-encode: fix sparse NULL pointer warnings

Hi Ramsay, On Mon, 28 Jan 2019, Ramsay Jones wrote: > Hmm, I've never built an Ubuntu package before, so I don't know > exactly what would be required (spec file etc.) to create a PPA. > But I suspect you are not talking about doing that, right? I would have gone for `checkinstall`... That still

Re: [PATCH v2 14/14] trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh

"Jeff Hostetler via GitGitGadget" writes: > +test_expect_success 'perf stream, return code 0' ' > + test_when_finished "rm trace.perf actual expect" && > + GIT_TR2_PERF="$(pwd)/trace.perf" && export GIT_TR2_PERF && > + $TT trace2 001return 0 && > + unset GIT_TR2_PERF && Do not do

Re: [PATCH] rebase -x: sanity check command

Hi Phillip, On Mon, 28 Jan 2019, Phillip Wood wrote: > From: Phillip Wood > > If the user gives an empty argument to --exec then the rebase starts to > run before erroring out with > > error: missing arguments for exec > error: invalid line 2: exec > You can fix this with 'git rebase --e

Re: [PATCH v2] checkout: print something when checking out paths

Nguyễn Thái Ngọc Duy writes: > One of the problems with "git checkout" is that it does so many > different things and could confuse people specially when we fail to > handle ambiguation correctly. > > One way to help with that is tell the user what sort of operation is > actually carried out. Wh

Re: [PATCH] rebase -x: sanity check command

Hi Junio, On Mon, 28 Jan 2019, Junio C Hamano wrote: > Phillip Wood writes: > > > From: Phillip Wood > > > > If the user gives an empty argument to --exec then the rebase starts to > > run before erroring out with > > > > error: missing arguments for exec > > error: invalid line 2: exec >

[PATCH v5 6/7] strbuf: separate callback for strbuf_expand:ing literals

Expanding '%n' and '%xNN' is generic functionality, so extract that from the pretty.c formatter into a callback that can be reused. No functional change intended Signed-off-by: Anders Waldenborg --- pretty.c | 16 +--- strbuf.c | 21 + strbuf.h | 8 3 f

[PATCH v5 3/7] pretty: single return path in %(trailers) handling

No functional change intended. This change may not seem useful on its own, but upcoming commits will do memory allocation in there, and a single return path makes deallocation easier. Signed-off-by: Anders Waldenborg --- pretty.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --

[PATCH v5 1/7] doc: group pretty-format.txt placeholders descriptions

The placeholders can be grouped into three kinds: * literals * affecting formatting of later placeholders * expanding to information in commit Also change the list to a definition list (using '::') Signed-off-by: Anders Waldenborg --- Documentation/pretty-formats.txt | 235 --

[PATCH v5 5/7] pretty: add support for "valueonly" option in %(trailers)

With the new "key=" option to %(trailers) it often makes little sense to show the key, as it by definition already is knows which trailer is printed there. This new "valueonly" option makes it omit the key when printing trailers. E.g.: $ git show -s --pretty='%s%n%(trailers:key=Signed-off-by,valu

[PATCH v5 7/7] pretty: add support for separator option in %(trailers)

By default trailer lines are terminated by linebreaks ('\n'). By specifying the new 'separator' option they will instead be separated by user provided string and have separator semantics rather than terminator semantics. The separator string can contain the literal formatting codes %n and %xNN allo

[PATCH v5 4/7] pretty: allow showing specific trailers

Adds a new "key=X" option to "%(trailers)" which will cause it to only print trailer lines which match any of the specified keys. Signed-off-by: Anders Waldenborg --- Documentation/pretty-formats.txt | 8 + pretty.c | 36 ++-- t/t4205-log-pretty-forma

[PATCH v5 2/7] pretty: Allow %(trailers) options with explicit value

In addition to old %(trailers:only) it is now allowed to write %(trailers:only=yes) By itself this only gives (the not quite so useful) possibility to have users change their mind in the middle of a formatting string (%(trailers:only=true,only=false)). However, it gives users the opportunity to ov

[PATCH v5 0/7] %(trailers) improvements in pretty format

Updates since v4: * Coding style fixes * Reuse git_parse_maybe_bool for bool parsing Anders Waldenborg (7): doc: group pretty-format.txt placeholders descriptions pretty: Allow %(trailers) options with explicit value pretty: single return path in %(trailers) handling pretty: allow showin

[PATCH v2 09/14] trace2:data: add trace2 instrumentation to index read/write

From: Jeff Hostetler Add trace2 events to measure reading and writing the index. Signed-off-by: Jeff Hostetler --- read-cache.c | 47 ++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index bfff271a3d..f6d8

[PATCH v2 11/14] trace2:data: add subverb to checkout command

From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- builtin/checkout.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/builtin/checkout.c b/builtin/checkout.c index 6fadf412e8..8939ae99ed 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -262,6 +262,8 @@ static int check

[PATCH v2 02/14] trace2: create new combined trace facility

From: Jeff Hostetler Create a new unified tracing facility for git. The eventual intent is to replace the current trace_printf* and trace_performance* routines with a unified set of git_trace2* routines. In addition to the usual printf-style API, trace2 provides higer-level event verbs with fix

[PATCH v2 12/14] trace2:data: add subverb to reset command

From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- builtin/reset.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/builtin/reset.c b/builtin/reset.c index 59898c972e..b65b4a66db 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -340,6 +340,7 @@ int cmd_reset(int argc, const ch

[PATCH v2 06/14] trace2:data: add trace2 sub-process classification

From: Jeff Hostetler Add trace2 classification for long-running processes started in sub-process.c Signed-off-by: Jeff Hostetler --- sub-process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sub-process.c b/sub-process.c index 8d2a1707cf..3f4af93555 100644 --- a/sub-process.c +++ b/sub

[PATCH v2 08/14] trace2:data: add trace2 hook classification

From: Jeff Hostetler Classify certain child processes as hooks. Signed-off-by: Jeff Hostetler --- builtin/am.c | 1 + builtin/receive-pack.c | 4 builtin/worktree.c | 1 + sequencer.c| 2 ++ transport.c| 1 + 5 files changed, 9 insertions(+) diff --g

[PATCH v2 13/14] trace2:data: add subverb for rebase

From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- builtin/rebase.c | 19 +++ 1 file changed, 19 insertions(+) diff --git a/builtin/rebase.c b/builtin/rebase.c index 00de70365e..aac0d52ade 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -819,6 +819,16 @@ int cmd_reb

[PATCH v2 01/14] trace2: Documentation/technical/api-trace2.txt

From: Jeff Hostetler Created design document for Trace2 feature. Signed-off-by: Jeff Hostetler --- Documentation/technical/api-trace2.txt | 1158 1 file changed, 1158 insertions(+) create mode 100644 Documentation/technical/api-trace2.txt diff --git a/Documentation/t

[PATCH v2 10/14] pack-objects: add trace2 regions

From: Derrick Stolee When studying the performance of 'git push' we would like to know how much time is spent at various parts of the command. One area that could cause performance trouble is 'git pack-objects'. Add trace2 regions around the three main actions taken in this command: 1. Enumerat

[PATCH v2 14/14] trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh

From: Jeff Hostetler Create unit tests for Trace2. Signed-off-by: Jeff Hostetler --- Makefile | 1 + t/helper/test-tool.c | 1 + t/helper/test-tool.h | 1 + t/helper/test-trace2.c| 273 ++ t/t0210-trace2-normal.sh | 147

[PATCH v2 07/14] trace2:data: add trace2 transport child classification

From: Jeff Hostetler Add trace2 child classification for transport processes. Signed-off-by: Jeff Hostetler --- connect.c | 3 +++ transport-helper.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/connect.c b/connect.c index 24281b6082..3c6f829a05 100644 --- a/connect.c +++ b/

[PATCH v2 04/14] trace2:data: add trace2 regions to wt-status

From: Jeff Hostetler Add trace2_region_enter() and trace2_region_leave() calls around the various phases of a status scan. This gives elapsed time for each phase in the GIT_TR2_PERF and GIT_TR2_EVENT trace target. Also, these Trace2 calls now use s->repo rather than the_repository. Signed-off-

[PATCH v2 00/14] Trace2 tracing facility

V2 addresses: [] "jh/trace2" bad interaction with "js/vsts-ci" in "pu". [] coccinelle warnings in trace2/tr2_tgt_perf.c reported during CI testing. This patch series contains a greatly refactored version of my original

[PATCH v2 03/14] trace2: collect platform-specific process information

From: Jeff Hostetler Add optional platform-specific code to log information about the current process. On Windows, this includes whether git.exe is running under a debugger and information about the ancestors of the process. The purpose of this information is to help indicate if the process was

[PATCH v2 05/14] trace2:data: add editor/pager child classification

From: Jeff Hostetler Add trace2 process classification for editor and pager child processes. Signed-off-by: Jeff Hostetler --- editor.c | 1 + pager.c | 1 + 2 files changed, 2 insertions(+) diff --git a/editor.c b/editor.c index c985eee1f9..71547674ab 100644 --- a/editor.c +++ b/editor.c @@

Re: [PATCH v2 1/2] config: allow giving separate author and committer idents

Ævar Arnfjörð Bjarmason writes: > I'm happy to help if you'd like. I had a thinko with "table", and I > think our asciidoc dialect doesn't support it (maybe I'm wrong), but > thinking about it again we could just describe these variables all in > the same documentation. As in this hunk (which you

Re: protocol v2: More data transmitted between client and server since v2.20.0

On Mon, Jan 21, 2019 at 11:45:20AM +0530, Kaartic Sivaraam wrote: > I recently came across a blog[1] about how protocol v2 speeds up the > transfer between the client and the server. It states that the amount > of data transmitted between the client and the server is less when > using the protocol

Re: unclear docs

On Mon, Jan 28, 2019 at 11:16:54PM +0300, Sergey Lukashev wrote: > >>  > Subject: [PATCH] doc/gitattributes: clarify "autocrlf overrides eol" > >>  > > >>  > We only override core.eol with core.autocrlf when the latter is set to > >>  > "true" (otherwise, core.eol would never do anything!). Let's

Re: unclear docs

autocrlf can be "input" as well. 28.01.2019, 21:32, "Jeff King" : > On Mon, Jan 28, 2019 at 10:30:31AM -0800, Junio C Hamano wrote: > >>  Jeff King writes: >> >>  > I think it means: >>  > >>  > - if core.autocrlf is false (the default), then the text attribute and >>  > core.eol are used >>  > >

Re: sparse job, was Re: [PATCH] test-xml-encode: fix sparse NULL pointer warnings

On 28/01/2019 16:10, Johannes Schindelin wrote: > Hi Ramsay, > > On Sat, 26 Jan 2019, Ramsay Jones wrote: > >> >> Signed-off-by: Ramsay Jones >> --- >> >> Hi Johannes, >> >> If you need to re-roll your 'js/vsts-ci' branch, could you please >> squash this into the relevant patch (commit af7747

Re: [PATCH v2 1/2] config: allow giving separate author and committer idents

On Mon, Jan 28 2019, William Hubbs wrote: > On Fri, Jan 25, 2019 at 11:58:10PM +0100, Ævar Arnfjörð Bjarmason wrote: >> >> On Fri, Jan 25 2019, William Hubbs wrote: >> >> > diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt >> > index b5b2ba1199..18e1ec3c1b 100644 >> > --

Re: [PATCH v2 2/2] tests: add test for separate author and committer idents

On Sun, Jan 27 2019, Eric Sunshine wrote: > On Sat, Jan 26, 2019 at 3:53 AM Ævar Arnfjörð Bjarmason > wrote: >> Which, looking at this again, you'd only want if a previous test in the >> file was leaking its state. That's not the case, so this isn't needed >> and you can just apply this on top:

Re: [PATCH v2 1/2] config: allow giving separate author and committer idents

William Hubbs writes: > This doesn't look like it is beyond 79 characters to me, but that may be > because I use a tab stop width of 4. In this project, a tab skips to multiple of 8.

Re: [PATCH v2] teach git to support a virtual (partially populated) work directory

Ping. Any thoughts, comments, feedback, suggestions? On 12/13/2018 2:41 PM, Ben Peart wrote: From: Ben Peart To make git perform well on the very largest repos, we must make git operations O(modified) instead of O(size of repo). This takes advantage of the fact that the number of files a dev

Re: [PATCH v2 1/2] config: allow giving separate author and committer idents

On Fri, Jan 25, 2019 at 11:58:10PM +0100, Ævar Arnfjörð Bjarmason wrote: > > On Fri, Jan 25 2019, William Hubbs wrote: > > > diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt > > index b5b2ba1199..18e1ec3c1b 100644 > > --- a/Documentation/config/user.txt > > +++ b/Documen

Re: [PATCH v4 06/21] test-date: add a subcommand to measure times in shell scripts

Junio C Hamano writes: > Junio C Hamano writes: > >> I think the goal to have our own stopwatch so that we do not have to >> worry about differences among system-provided ones makes sense. >> >> The only thing that may become an issue is how widely available >> getnanotime() is. As "test-date"

Re: unclear docs

On Mon, Jan 28, 2019 at 10:30:31AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I think it means: > > > > - if core.autocrlf is false (the default), then the text attribute and > > core.eol are used > > > > - if core.autocrlf is true, then that overrides the whole > > attri

Re: unclear docs

On Mon, Jan 28, 2019 at 09:12:00PM +0300, Sergey Lukashev wrote: > Thank you. Does the paragraph about core.eol refers to the text > attribute? It's written 'property' there. I was thinking it means > whether git thinks file is text, using .gitattributes OR otherwise. > Maybe changing this word wi

Re: unclear docs

Jeff King writes: > I think it means: > > - if core.autocrlf is false (the default), then the text attribute and > core.eol are used > > - if core.autocrlf is true, then that overrides the whole > attribute/eol system I think that matches my understanding. > Subject: [PATCH] doc/git

Re: [PATCH v2] git-instaweb: Add Python builtin http.server support

Arti Zirk writes: > The generated wrapper is compatible with both Python 2 and 3. ;-) Yup, that obviously is the best way to settle "should we make it clear that this would not work with Python 2?" question.

Re: [PATCH] implicit interactive rebase: don't run sequence editor

Phillip Wood writes: > From: Phillip Wood > > If GIT_SEQUENCE_EDITOR is set then rebase runs it when executing > implicit interactive rebases which are supposed to appear > non-interactive to the user. Fix this by setting GIT_SEQUENCE_EDITOR=: > rather than GIT_EDITOR=:. A couple of tests relied

Re: [PATCH] rebase -x: sanity check command

Phillip Wood writes: > From: Phillip Wood > > If the user gives an empty argument to --exec then the rebase starts to > run before erroring out with > > error: missing arguments for exec > error: invalid line 2: exec > You can fix this with 'git rebase --edit-todo' and then run 'git rebase

Re: env GIT_WORK_TREE ignored by git describe --dirty

On Fri, Jan 25, 2019 at 07:52:24PM -0500, Moocowmoo . wrote: > git describe --dirty shows dirty when cwd not repo work directory. > > Confirmed by osse on freenode irc #git > > ubuntu@wrk:~/tmp$ pwd > /home/ubuntu/tmp > ubuntu@wrk:~/tmp$ git clone https://github.com/ipfs/go-ipfs.git > ub

Re: unclear docs

Thank you. Does the paragraph about core.eol refers to the text attribute? It's written 'property' there. I was thinking it means whether git thinks file is text, using .gitattributes OR otherwise. Maybe changing this word will make it clearer? 28.01.2019, 19:09, "Jeff King" : > On Sun, Jan 27,

Re: [PATCH 00/14] Trace2 tracing facility

Jeff Hostetler writes: > On 1/22/2019 4:22 PM, Jeff Hostetler via GitGitGadget wrote: >> This patch series contains a greatly refactored version of my original >> Trace2 series [1] from August 2018. > > > My Trace2 series "jh/trace2" has a bad interaction with "js/vsts-ci" > causing some unit tes

Re: There should be a `.gitbless; file, protecting files from git clean

Duy Nguyen writes: > There's a patch that adds "precious" git attribute [1]. I was going to > resend once the backup-log [2] got reviewed but I might just send it > separately to handle the "git clean" case alone. Thanks.

Re: [PATCH v2] git-instaweb: Add Python builtin http.server support

> I will point out, that despite what the PEPs say, on Debian and > derivatives, "python" will always invoke Python 2, and never Python > 3. > > This is probably fine for now, but we'll need to reconsider it before > 2020. In this case it shouldn't be a problem because I have made sure that it wo

Re: unclear docs

On Sun, Jan 27, 2019 at 02:55:23PM +0300, Sergey Lukashev wrote: > A follow up on my previous mail. > > Well, I have two problems: > 1) The endings I get with core.autocrlf=false depend on whether I have * > text=auto (a file was commited with LFs). At least in git 2.20.1 > 2) If the quote holds t

Re: Git checkout multiple options issue

Kevin Daudt writes: > On Mon, Jan 28, 2019 at 10:20:02AM -0500, Randall S. Becker wrote: >> On January 28, 2019 9:25, COLLOMB Joris wrote: >> ... >> > git checkout -f -b "branch_name" >> > gives me " Fatal: A branch named 'branch_name' already exists." >> >> Once the branch is created, you can't

Re: [PATCH/RFC] completion: complete refs in multiple steps

On Mon, Jan 28, 2019 at 12:27:07PM -0500, Jeff King wrote: > Doing that requires actually understanding that the refs are in a list, > and not formatting each one independently. So I kind of wonder if it > would be easier to simply have a completion mode in ref-filter. Er, I meant "a completion m

Re: [PATCH/RFC] completion: complete refs in multiple steps

On Mon, Jan 28, 2019 at 03:38:28PM +0100, SZEDER Gábor wrote: > > - __gitcomp_direct "$(__git_refs "$remote" "$track" "$pfx" "$cur_" > > "$sfx")" > > + __gitcomp_direct "$(__git_refs "$remote" "$track" "$pfx" "$cur_" "$sfx" > > | __git_collapse_refs "$cur_")" > > } > > In general I think i

Re: [PATCH v4 04/21] ci: inherit --jobs via MAKEFLAGS in run-build-and-tests

Hi Gábor, On Fri, 25 Jan 2019, SZEDER Gábor wrote: > On Wed, Jan 23, 2019 at 02:22:10PM -0800, Junio C Hamano wrote: > > "Johannes Schindelin via GitGitGadget" > > writes: > > > > > From: Johannes Schindelin > > > > > > Let's not decide in the generic ci/ script how many jobs to run in > > > p

RE: Git checkout multiple options issue

> Once the branch is created, you can't force its creation, because it is > already created. Sorry to not be agree, in the man page of git branch: -f, --force Reset to if exists already. Without -f git branch refuses to change an existing branch. In combination with -d (or

Re: unclear docs

On Sun, Jan 27, 2019 at 12:58:58PM +0300, Sergey Lukashev wrote: > Could somebody please explain what 'core.autocrlf overrides core.eol' > means given that we have the following statement in core.eol docs: > "Sets the line ending type to use in the working directory for files > that have the text 

Re: unclear docs

On Sun, Jan 27, 2019 at 02:55:23PM +0300, Sergey Lukashev wrote: > Well, I have two problems: > 1) The endings I get with core.autocrlf=false depend on whether I have >* text=auto (a file was commited with LFs). At least in git 2.20.1 That sounds right. The default is that Git will never touc

Re: [PATCH] object_as_type: initialize commit-graph-related fields of 'struct commit'

On Sun, Jan 27, 2019 at 02:08:32PM +0100, SZEDER Gábor wrote: > When the commit graph and generation numbers were introduced in > commits 177722b344 (commit: integrate commit graph with commit > parsing, 2018-04-10) and 83073cc994 (commit: add generation number to > struct commit, 2018-04-25), the

  1   2   >