Re: [PATCH 0/2] Add "git rebase --show-patch"

2018-01-26 Thread Duy Nguyen
On Sat, Jan 27, 2018 at 1:47 AM, Tim Landscheidt wrote: > Nguyễn Thái Ngọc Duy wrote: > >> When a conflict happens during a rebase, you often need to look at the >> original patch to see what the changes are. This requires opening your >> favourite

Re: [PATCH 2/2] rebase: add --show-patch

2018-01-26 Thread Duy Nguyen
On Sat, Jan 27, 2018 at 2:11 AM, Eric Sunshine wrote: > On Fri, Jan 26, 2018 at 4:55 AM, Nguyễn Thái Ngọc Duy > wrote: >> It is useful to see the full patch while resolving conflicts in a >> rebase. The only way to do it now is >> >> less

[PATCH] trace: measure where the time is spent in the index-heavy operations

2018-01-26 Thread Nguyễn Thái Ngọc Duy
All the known heavy code blocks are measured (except object database access). This should help identify if an optimization is effective or not. An unoptimized git-status would give something like below (92% of time is accounted). Signed-off-by: Nguyễn Thái Ngọc Duy --- This

Re: Some rough edges of core.fsmonitor

2018-01-26 Thread Duy Nguyen
On Sat, Jan 27, 2018 at 7:28 AM, Ævar Arnfjörð Bjarmason wrote: > 3) A lot of time spend reading the index (or something..) I'm resending a patch from my old index-helper series. It should measure all big time consuming blocks in git. Maybe we should get it merged... > While

Some rough edges of core.fsmonitor

2018-01-26 Thread Ævar Arnfjörð Bjarmason
I just got around to testing this since it landed, for context some previous poking of mine in [1]. Issues / stuff I've noticed: 1) We end up invalidating the untracked cache because stuff in .git/ changed. For example: 01:09:24.975524 fsmonitor.c:173 fsmonitor process

Re: [PATCH v3 00/14] Some fixes and bunch of object_id conversions

2018-01-26 Thread brian m. carlson
On Wed, Jan 24, 2018 at 01:41:07PM -0800, Junio C Hamano wrote: > Patryk Obara writes: > > > Patryk Obara (14): > > http-push: improve error log > > clang-format: adjust penalty for return type line break > > sha1_file: convert pretend_sha1_file to object_id > >

Re: [PATCH v3 13/14] sha1_file: convert write_loose_object to object_id

2018-01-26 Thread brian m. carlson
On Wed, Jan 24, 2018 at 12:12:05PM +0100, Patryk Obara wrote: > Convert the definition and declaration of statis write_loose_object s/statis/static/ -- brian m. carlson / brian with sandals: Houston, Texas, US https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP:

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

2018-01-26 Thread Lars Schneider
> On 22 Jan 2018, at 19:27, SZEDER Gábor wrote: > > > On Thu, Jan 18, 2018 at 1:47 PM, Duy Nguyen wrote: >> On Thu, Jan 18, 2018 at 6:36 PM, SZEDER Gábor wrote: >>> This series, queued as 'nd/shared-index-fix', makes the 32 bit

Re: [PATCH v2 13/27] ls-refs: introduce ls-refs server command

2018-01-26 Thread Stefan Beller
On Thu, Jan 25, 2018 at 3:58 PM, Brandon Williams wrote: > +ls-refs takes in the following parameters wrapped in packet-lines: > + > +symrefs > + In addition to the object pointed by it, show the underlying ref > + pointed by it when showing a symbolic ref. > +

Re: [PATCH RFC 04/24] cat-file: reuse struct ref_format

2018-01-26 Thread Junio C Hamano
Olga Telezhnaya writes: > Start using ref_format struct instead of simple char*. > Need that for further reusing of formatting logic from ref-filter. > > Signed-off-by: Olga Telezhnaia > Mentored-by: Christian Couder

Re: [PATCH 09/10] t: make sure that 'test_i18ngrep' got enough parameters

2018-01-26 Thread Eric Sunshine
On Fri, Jan 26, 2018 at 7:37 AM, SZEDER Gábor wrote: > Two of the previous patches in this series fixed two bogus > 'test_i18ngrep' invocations that had neither a filename parameter not s/not/nor/ > anything piped into their standard input, yet both managed to remain >

Re: [PATCH 05/14] packed-graph: implement construct_graph()

2018-01-26 Thread Junio C Hamano
Andreas Schwab writes: > On Jan 26 2018, Junio C Hamano wrote: > >> Also, would >>32 be a problem if commit.date is an uint32 (and >> shifting all its bits out to the right)? > > It would be undefined. Yup, exactly. Thanks.

Re: [PATCH RFC 03/24] cat-file: split expand_atom into 2 functions

2018-01-26 Thread Junio C Hamano
Olga Telezhnaya writes: > Split expand_atom function into 2 different functions, > expand_atom_into_fields prepares variable for further filling, > (new) expand_atom creates resulting string. > Need that for further reusing of formatting logic from ref-filter. > >

Re: [PATCH v2 05/27] upload-pack: factor out processing lines

2018-01-26 Thread Brandon Williams
On 01/26, Stefan Beller wrote: > On Thu, Jan 25, 2018 at 3:58 PM, Brandon Williams wrote: > > Factor out the logic for processing shallow, deepen, deepen_since, and > > deepen_not lines into their own functions to simplify the > > 'receive_needs()' function in addition to

Re: [PATCH 05/14] packed-graph: implement construct_graph()

2018-01-26 Thread Andreas Schwab
On Jan 26 2018, Junio C Hamano wrote: > Also, would >>32 be a problem if commit.date is an uint32 (and > shifting all its bits out to the right)? It would be undefined. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3

Re: [PATCH RFC 02/24] ref-filter: add return value to some functions

2018-01-26 Thread Junio C Hamano
Olga Telezhnaya writes: > Add return flag to format_ref_array_item, show_ref_array_item, > get_ref_array_info and populate_value for further using. > Need it to handle situations when item is broken but we can not invoke > die() because we are in batch mode and all

Re: [PATCH 05/14] packed-graph: implement construct_graph()

2018-01-26 Thread Junio C Hamano
Derrick Stolee writes: > + packedDate[0] = htonl((*list)->date >> 32); > + packedDate[1] = htonl((*list)->date); How forward-looking do we want to be? The commit.date field happens to be unsigned so there is no point masking the result of right

Re: [PATCH 05/14] packed-graph: implement construct_graph()

2018-01-26 Thread Junio C Hamano
Stefan Beller writes: > On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: > >> +struct object_id *construct_graph(const char *pack_dir) >> +{ >> + // Find a list of oids, adding the pointer to a list. > > Comment style. > Here is where the bike

Re: [PATCH 10/10] t: make 'test_i18ngrep' more informative on failure

2018-01-26 Thread Jeff King
On Fri, Jan 26, 2018 at 09:26:38PM +0100, SZEDER Gábor wrote: > Yeah, I knew about TEST_SHELL_PATH, but still: > > $ make -j4 TEST_SHELL_PATH=/bin/bash > <...> > $ cd t/ > $ for t in t[0-9][0-9][0-9][0-9]-*.sh ; do "./$t" -x ; done >/dev/null 2>&1 > $ grep '^failed [^0]$'

Re: [PATCH 10/10] t: make 'test_i18ngrep' more informative on failure

2018-01-26 Thread SZEDER Gábor
On Fri, Jan 26, 2018 at 8:25 PM, Jeff King wrote: > On Fri, Jan 26, 2018 at 08:23:24PM +0100, SZEDER Gábor wrote: > >> On Fri, Jan 26, 2018 at 7:50 PM, Jeff King wrote: >> > You can also use "-x" to get a better >> > sense of exactly which command failed, >> >>

Re: [PATCH RFC 01/24] ref-filter: get rid of goto

2018-01-26 Thread Junio C Hamano
Olga Telezhnaya writes: > Get rid of goto command in ref-filter for better readability. > > Signed-off-by: Olga Telezhnaia > Mentored-by: Christian Couder > Mentored by: Jeff King > --- How was

Re: [PATCH v2 05/27] upload-pack: factor out processing lines

2018-01-26 Thread Stefan Beller
On Thu, Jan 25, 2018 at 3:58 PM, Brandon Williams wrote: > Factor out the logic for processing shallow, deepen, deepen_since, and > deepen_not lines into their own functions to simplify the > 'receive_needs()' function in addition to making it easier to reuse some > of this

[PATCH RFC 08/24] ref-filter: reuse parse_ref_filter_atom

2018-01-26 Thread Olga Telezhnaya
Continue migrating formatting logic from cat-file to ref-filter. Reuse parse_ref_filter_atom for unifying all processes in ref-filter and further reducing of expand_atom_into_fields function. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

[PATCH RFC 15/24] cat-file: move skip_object_info into ref-filter

2018-01-26 Thread Olga Telezhnaya
Move logic related to skip_object_info into ref-filter, so that cat-file does not use that field at all. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 7 +--

[PATCH RFC 02/24] ref-filter: add return value to some functions

2018-01-26 Thread Olga Telezhnaya
Add return flag to format_ref_array_item, show_ref_array_item, get_ref_array_info and populate_value for further using. Need it to handle situations when item is broken but we can not invoke die() because we are in batch mode and all items need to be processed. Signed-off-by: Olga Telezhnaia

[PATCH RFC 05/24] ref-filter: make valid_atom as function parameter

2018-01-26 Thread Olga Telezhnaya
Make valid_atom as a function parameter, there could be another variable further. Need that for further reusing of formatting logic in cat-file.c. We do not need to allow users to pass their own valid_atom variable in global functions like verify_ref_format because in the end we want to have same

[PATCH RFC 06/24] cat-file: move struct expand_data into ref-filter

2018-01-26 Thread Olga Telezhnaya
Need that for further reusing of formatting logic in cat-file. Have plans to get rid of using expand_data in cat-file at all, and use it only in ref-filter for collecting, formatting and printing needed data. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

[PATCH RFC 07/24] cat-file: start migrating to ref-filter

2018-01-26 Thread Olga Telezhnaya
Start moving formatting stuff related to data preparation from cat-file to ref-filter. Start from simple moving, it would be integrated into all ref-filter processes further. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

[PATCH RFC 21/24] ref-filter: work with objectsize:disk

2018-01-26 Thread Olga Telezhnaya
Make a temporary solution for commands that could use objectsize:disk atom. It's better to fill it with value or give an error if there is no value for this atom, but as a first solution we do dothing. It means that if objectsize:disk is used, we put an empty string there. Signed-off-by: Olga

[PATCH RFC 14/24] ref_filter: add is_rest_atom_used function

2018-01-26 Thread Olga Telezhnaya
Delete all items related to split_on_whitespace from ref-filter and add new function for handling the logic. Now cat-file could invoke that function to implementing its logic. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

[PATCH RFC 09/24] cat-file: start use ref_array_item struct

2018-01-26 Thread Olga Telezhnaya
Moving from using expand_data to ref_array_item structure. That helps us to reuse functions from ref-filter easier. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c |

[PATCH RFC 13/24] ref-filter: add is_cat flag

2018-01-26 Thread Olga Telezhnaya
Add is_cat flag, further it helps to get rid of cat_file_data field in ref_format. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 1 + ref-filter.c | 8

[PATCH RFC 03/24] cat-file: split expand_atom into 2 functions

2018-01-26 Thread Olga Telezhnaya
Split expand_atom function into 2 different functions, expand_atom_into_fields prepares variable for further filling, (new) expand_atom creates resulting string. Need that for further reusing of formatting logic from ref-filter. Signed-off-by: Olga Telezhnaia

[PATCH RFC 11/24] cat-file: start reusing populate_value

2018-01-26 Thread Olga Telezhnaya
Move logic related to getting object info from cat-file to ref-filter. It will help to reuse whole formatting logic from ref-filter further. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King

[PATCH RFC 04/24] cat-file: reuse struct ref_format

2018-01-26 Thread Olga Telezhnaya
Start using ref_format struct instead of simple char*. Need that for further reusing of formatting logic from ref-filter. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King ---

[PATCH RFC 20/24] ref-filter: unifying formatting of cat-file opts

2018-01-26 Thread Olga Telezhnaya
cat-file options are now filled by general logic. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 31 ++- 1 file changed, 14 insertions(+),

[PATCH RFC 22/24] for-each-ref: tests for new atoms added

2018-01-26 Thread Olga Telezhnaya
Add tests for new formatting atoms: rest, deltabase, objectsize:disk. rest means nothing and we expand it into empty string. We need this atom for cat-file command. Have plans to support deltabase and objectsize:disk further (as it is done in cat-file), now also expand it to empty string.

[PATCH RFC 12/24] ref-filter: get rid of expand_atom_into_fields

2018-01-26 Thread Olga Telezhnaya
Remove expand_atom_into_fields function and create same logic in terms of ref-filter style. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 45

[PATCH RFC 19/24] ref-filter: make populate_value internal again

2018-01-26 Thread Olga Telezhnaya
Remove populate_value from header file. We needed that for interim step, now it could be returned back. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 2 +-

[PATCH RFC 16/24] ref-filter: make cat_file_info independent

2018-01-26 Thread Olga Telezhnaya
Remove connection between expand_data variable in cat-file and in ref-filter. It will help further to get rid of using expand_data in cat-file. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King

[PATCH RFC 17/24] cat-file: reuse printing logic from ref-filter

2018-01-26 Thread Olga Telezhnaya
Reuse code from ref-filter to print resulting message. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 52 +---

[PATCH RFC 24/24] cat-file: update of docs

2018-01-26 Thread Olga Telezhnaya
Update the docs for cat-file command. Some new formatting atoms added because of reusing ref-filter code. We do not support cat-file atoms in general formatting logic (there is just the support for cat-file), that is why some of the atoms are still explained in cat-file docs. We need to move these

[PATCH RFC 10/24] ref-filter: make populate_value global

2018-01-26 Thread Olga Telezhnaya
Make function global for further using in cat-file. In the end of patch series this function becomes internal again, so this is a part of middle step. cat-file would use more general functions further. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder

[PATCH RFC 01/24] ref-filter: get rid of goto

2018-01-26 Thread Olga Telezhnaya
Get rid of goto command in ref-filter for better readability. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 103

[PATCH RFC 18/24] ref-filter: make valid_atom general again

2018-01-26 Thread Olga Telezhnaya
Stop using valid_cat_file_atom, making the code more general. Further commits will contain some tests, docs and support of new features. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King ---

[PATCH RFC 23/24] cat-file: tests for new atoms added

2018-01-26 Thread Olga Telezhnaya
Add some tests for new formatting atoms from ref-filter. Some of new atoms are supported automatically, some of them are expanded into empty string (because they are useless for some types of objects), some of them could be supported later in other patches. Signed-off-by: Olga Telezhnaia

Re: [PATCH 11/14] commit: integrate packed graph with commit parsing

2018-01-26 Thread Stefan Beller
On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: > Teach Git to inspect a packed graph to supply the contents of a > struct commit when calling parse_commit_gently(). This implementation > satisfies all post-conditions on the struct commit, including loading > parents, the

Re: Please review my code

2018-01-26 Thread Оля Тележная
2018-01-26 19:42 GMT+03:00 Christian Couder : > On Fri, Jan 26, 2018 at 11:32 AM, Оля Тележная > wrote: >> 2018-01-25 23:22 GMT+03:00 Christian Couder : >>> On Thu, Jan 25, 2018 at 6:20 PM, Оля Тележная

Re: [PATCH 10/10] t: make 'test_i18ngrep' more informative on failure

2018-01-26 Thread Jeff King
On Fri, Jan 26, 2018 at 08:23:24PM +0100, SZEDER Gábor wrote: > On Fri, Jan 26, 2018 at 7:50 PM, Jeff King wrote: > > On Fri, Jan 26, 2018 at 01:37:08PM +0100, SZEDER Gábor wrote: > > > >> When 'test_i18ngrep' can't find the expected pattern, it exits > >> completely silently;

Re: [PATCH 05/10] t5510: consolidate 'grep' and 'test_i18ngrep' patterns

2018-01-26 Thread Junio C Hamano
SZEDER Gábor writes: > No, GETTEXT_POISON only affects the translated messages, but those > 'grep' invocations looked only at refnames and formatting. You are right for this specific case, but I was talking more from general principle---running test_i18ngrep on an output

Re: [PATCH 10/10] t: make 'test_i18ngrep' more informative on failure

2018-01-26 Thread SZEDER Gábor
On Fri, Jan 26, 2018 at 7:50 PM, Jeff King wrote: > On Fri, Jan 26, 2018 at 01:37:08PM +0100, SZEDER Gábor wrote: > >> When 'test_i18ngrep' can't find the expected pattern, it exits >> completely silently; when its negated form does find the pattern that >> shouldn't be there, it

Re: [PATCH 05/10] t5510: consolidate 'grep' and 'test_i18ngrep' patterns

2018-01-26 Thread SZEDER Gábor
On Fri, Jan 26, 2018 at 7:16 PM, Junio C Hamano wrote: > SZEDER Gábor writes: > >> One of the tests in 't5510-fetch.sh' checks the output of 'git fetch' >> using 'test_i18ngrep', and while doing so it prefilters the output >> with 'grep' before piping the

Re: [PATCH 08/10] t: forbid piping into 'test_i18ngrep'

2018-01-26 Thread Junio C Hamano
SZEDER Gábor writes: > With 'test_i18ngrep' outside the 'test_expect_success' block!? > Definitely too contrived. :) Well, I think you got the idea. The point is that test_i18ngrep may not be the only thing that is redirected into, but can just be a part of a block of

Re: [PATCH 2/2] rebase: add --show-patch

2018-01-26 Thread Eric Sunshine
On Fri, Jan 26, 2018 at 4:55 AM, Nguyễn Thái Ngọc Duy wrote: > It is useful to see the full patch while resolving conflicts in a > rebase. The only way to do it now is > > less .git/rebase-*/patch > > which could turn out to be a lot longer to type [1] if you are in a >

Re: [PATCH 07/10] t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'

2018-01-26 Thread SZEDER Gábor
On Fri, Jan 26, 2018 at 7:19 PM, Junio C Hamano wrote: > SZEDER Gábor writes: > >> Both 'test_i18ncmp' and 'test_i18ngrep' helper functions are supposed >> to be called from our test scripts, so they should be in >> 'test-lib-functions.sh'. >> >>

Re: [PATCH 6/6] daemon: fix length computation in newline stripping

2018-01-26 Thread Jeff King
On Thu, Jan 25, 2018 at 04:38:20PM -0500, Eric Sunshine wrote: > On Wed, Jan 24, 2018 at 7:58 PM, Jeff King wrote: > > When git-daemon gets a pktline request, we strip off any > > trailing newline, replacing it with a NUL. Clients prior to > > 5ad312bede (in git v1.4.0) would

Re: [PATCH 08/10] t: forbid piping into 'test_i18ngrep'

2018-01-26 Thread SZEDER Gábor
On Fri, Jan 26, 2018 at 7:24 PM, Junio C Hamano wrote: > SZEDER Gábor writes: > >> See two of the previous patches for the only such cases we had in our >> test suite. However, reliably preventing this antipattern is arguably >> more important than

Re: [PATCH 00/10] 'test_i18ngrep'-related fixes and improvements

2018-01-26 Thread Jeff King
On Fri, Jan 26, 2018 at 01:36:58PM +0100, SZEDER Gábor wrote: > When 'test_i18ngrep' can't find the expected pattern, it exits > completely silently; when its negated form does find the pattern that > shouldn't be there, it prints the matching line(s) but otherwise exits > without any error

Re: [PATCH 10/10] t: make 'test_i18ngrep' more informative on failure

2018-01-26 Thread Jeff King
On Fri, Jan 26, 2018 at 01:37:08PM +0100, SZEDER Gábor wrote: > When 'test_i18ngrep' can't find the expected pattern, it exits > completely silently; when its negated form does find the pattern that > shouldn't be there, it prints the matching line(s) but otherwise exits > without any error

Re: [PATCH 0/2] Add "git rebase --show-patch"

2018-01-26 Thread Tim Landscheidt
Nguyễn Thái Ngọc Duy wrote: > When a conflict happens during a rebase, you often need to look at the > original patch to see what the changes are. This requires opening your > favourite pager with some random path inside $GIT_DIR. > This series makes that experience a bit

Re: [PATCH 09/10] t: make sure that 'test_i18ngrep' got enough parameters

2018-01-26 Thread Jeff King
On Fri, Jan 26, 2018 at 01:37:07PM +0100, SZEDER Gábor wrote: > Two of the previous patches in this series fixed two bogus > 'test_i18ngrep' invocations that had neither a filename parameter not > anything piped into their standard input, yet both managed to remain > unnoticed for years. A third

Re: [PATCH 08/10] t: forbid piping into 'test_i18ngrep'

2018-01-26 Thread Jeff King
On Fri, Jan 26, 2018 at 10:39:05AM -0800, Junio C Hamano wrote: > Is there a case where test_i18ngrep (after your clean-ups in this > series up to 06/10) needs to read from more than one file? > > I actually think that the kind of inconveniences we *can* work with, > without risking breakage to

Re: [PATCH 08/10] t: forbid piping into 'test_i18ngrep'

2018-01-26 Thread Jeff King
On Fri, Jan 26, 2018 at 01:37:06PM +0100, SZEDER Gábor wrote: > When checking a git command's output with 'test_i18ngrep', it's > tempting to conveniently pipe the git command's standard output into > 'test_i18ngrep'. Unfortunately, this is an anti-pattern, because it > hides the git command's

Re: [PATCH 08/10] t: forbid piping into 'test_i18ngrep'

2018-01-26 Thread Junio C Hamano
Junio C Hamano writes: > SZEDER Gábor writes: > >> See two of the previous patches for the only such cases we had in our >> test suite. However, reliably preventing this antipattern is arguably >> more important than supporting these cases, which can be

Re: [PATCH 07/10] t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'

2018-01-26 Thread Jeff King
On Fri, Jan 26, 2018 at 10:19:17AM -0800, Junio C Hamano wrote: > SZEDER Gábor writes: > > > Both 'test_i18ncmp' and 'test_i18ngrep' helper functions are supposed > > to be called from our test scripts, so they should be in > > 'test-lib-functions.sh'. > > > >

Re: Feature request: Improve diff algorithm

2018-01-26 Thread Stefan Beller
On Wed, Jan 24, 2018 at 8:43 AM, KES wrote: > Here is another place where diff can be improved: > @@ -141,8 +140,9 @@ My_runops(pTHX) > // Do not trace variables in DB:: module > if( SvOK( inDB ) ) continue; > > - sv_inc_nomg( inDB

Re: [PATCH 02/10] t5812: add 'test_i18ngrep's missing filename parameter

2018-01-26 Thread Jeff King
On Fri, Jan 26, 2018 at 01:37:00PM +0100, SZEDER Gábor wrote: > The second 'test_i18ngrep' invocation in the test 'curl redirects > respect whitelist' is missing its filename parameter. This has > remained unnoticed since its introduction in f4113cac0 (http: limit > redirection to

Re: [PATCH 08/10] t: forbid piping into 'test_i18ngrep'

2018-01-26 Thread Junio C Hamano
SZEDER Gábor writes: > See two of the previous patches for the only such cases we had in our > test suite. However, reliably preventing this antipattern is arguably > more important than supporting these cases, which can be worked around > by only minor inconveniences. I

Re: [PATCH 01/10] t5541: add 'test_i18ngrep's missing filename parameter

2018-01-26 Thread Jeff King
On Fri, Jan 26, 2018 at 01:23:03PM -0500, Jeff King wrote: > On Fri, Jan 26, 2018 at 01:36:59PM +0100, SZEDER Gábor wrote: > > > The test 'push --no-progress silences progress but not status' runs > > 'test_i18ngrep' without specifying a filename parameter. This has > > remained unnoticed since

Re: [PATCH 01/10] t5541: add 'test_i18ngrep's missing filename parameter

2018-01-26 Thread Jeff King
On Fri, Jan 26, 2018 at 01:36:59PM +0100, SZEDER Gábor wrote: > The test 'push --no-progress silences progress but not status' runs > 'test_i18ngrep' without specifying a filename parameter. This has > remained unnoticed since its introduction in e304aeba2 (t5541: test > more combinations of

Re: [PATCH 07/10] t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'

2018-01-26 Thread Junio C Hamano
SZEDER Gábor writes: > Both 'test_i18ncmp' and 'test_i18ngrep' helper functions are supposed > to be called from our test scripts, so they should be in > 'test-lib-functions.sh'. > > Signed-off-by: SZEDER Gábor > --- > t/test-lib-functions.sh | 26

Re: [PATCH 01/14] graph: add packed graph design document

2018-01-26 Thread Stefan Beller
>>> +- A graph file is stored in a file named 'graph-.graph' in the pack >>> + directory. >> >> (guessing) >> where every commit up to is included in the file. > > > Sorry, the is the hash of the graph contents (up to its trailing bytes > that contain in binary). >> So maybe I do not

Re: [PATCH 05/10] t5510: consolidate 'grep' and 'test_i18ngrep' patterns

2018-01-26 Thread Junio C Hamano
SZEDER Gábor writes: > One of the tests in 't5510-fetch.sh' checks the output of 'git fetch' > using 'test_i18ngrep', and while doing so it prefilters the output > with 'grep' before piping the result into 'test_i18ngrep'. > > This prefiltering is unnecessary, with the

Re: [PATCH] setup: recognise extensions.objectFormat

2018-01-26 Thread Stefan Beller
On Thu, Jan 25, 2018 at 2:08 AM, Duy Nguyen wrote: > On Wed, Jan 24, 2018 at 8:09 PM, Patryk Obara wrote: >> This extension selects which hashing algorithm from vtable should be >> used for reading and writing objects in the object store. At the moment

Re: [PATCH] merge: support --strategy '?' for git-completion.bash

2018-01-26 Thread Junio C Hamano
Duy Nguyen writes: > I didn't look carefully at those sed magic. But it looks like it > correctly handles this case too. So v2 follows below. It still feels > dirty to do this kind of text manipulation though. But that can wait. I do like "introduce and use helper feature to

Re: [PATCH] setup: recognise extensions.objectFormat

2018-01-26 Thread Patryk Obara
On 26/01/2018 15:41, Johannes Schindelin wrote: On Thu, 25 Jan 2018, Duy Nguyen wrote: This config is so sensitive I wonder if we should forbid changing it via git-config. You can't simply change this and expect anything to work anyway. I don't think it makes sense to forbid `git config`

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-26 Thread Jeff Hostetler
On 1/25/2018 7:21 PM, Isaac Hier wrote: Hi Jeff, I have been looking at the build generator, which looks promising, but I have one concern. Assuming I can generate a CMakeLists.txt that appropriately updates the library sources, etc. how do you suggest I handle new portability macros? For

I NEED YOUR URGENT ASSISTANT

2018-01-26 Thread Salif Musa
Hi friend I am a banker in ADB BANK. I want to transfer an abandoned sum of USD15.6Million to your Bank account. 40/percent will be your share. No risk involved but keeps it as secret. Contact me for more details. Please reply me through my alternative email id only (salif.musa...@gmail.com)

Re: [PATCHv6 03/31] directory rename detection: testcases to avoid taking detection too far

2018-01-26 Thread Elijah Newren
On Fri, Jan 26, 2018 at 3:37 AM, SZEDER Gábor wrote: > On Fri, Jan 5, 2018 at 9:26 PM, Elijah Newren wrote: >> Signed-off-by: Elijah Newren >> --- >> t/t6043-merge-rename-directories.sh | 153 >> >>

Re: Please review my code

2018-01-26 Thread Christian Couder
On Fri, Jan 26, 2018 at 11:32 AM, Оля Тележная wrote: > 2018-01-25 23:22 GMT+03:00 Christian Couder : >> On Thu, Jan 25, 2018 at 6:20 PM, Оля Тележная >> wrote: >>> Please look at my code: >>>

Re: [PATCH] setup: recognise extensions.objectFormat

2018-01-26 Thread Johannes Schindelin
Hi Duy, On Thu, 25 Jan 2018, Duy Nguyen wrote: > On Wed, Jan 24, 2018 at 8:09 PM, Patryk Obara wrote: > > This extension selects which hashing algorithm from vtable should be > > used for reading and writing objects in the object store. At the moment > > supports only

Re: [PATCH 03/14] packed-graph: create git-graph builtin

2018-01-26 Thread Duy Nguyen
On Fri, Jan 26, 2018 at 8:14 PM, Derrick Stolee wrote: > On 1/25/2018 6:01 PM, Junio C Hamano wrote: >> >> Derrick Stolee writes: >> >>> Teach Git the 'graph' builtin that will be used for writing and >>> reading packed graph files. The current implementation

Re: [PATCH 01/14] graph: add packed graph design document

2018-01-26 Thread Duy Nguyen
On Thu, Jan 25, 2018 at 9:02 PM, Derrick Stolee wrote: > +Git walks the commit graph for many reasons, including: > + > +1. Listing and filtering commit history. > +2. Computing merge bases. > + > +These operations can become slow as the commit count grows above 100K. > +The

Re: [PATCH 06/14] packed-graph: implement git-graph --write

2018-01-26 Thread Derrick Stolee
On 1/25/2018 6:28 PM, Stefan Beller wrote: On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: + +$ git midx --write midx? Looks like I missed some replacements as I was building this. Now you see how I hope the feedback

Re: [PATCH 04/14] packed-graph: add format document

2018-01-26 Thread Derrick Stolee
On 1/25/2018 5:07 PM, Stefan Beller wrote: On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: Add document specifying the binary format for packed graphs. This format allows for: * New versions. * New hash functions and hash lengths. * Optional extensions. Basic header

Re: [PATCH 04/14] packed-graph: add format document

2018-01-26 Thread Derrick Stolee
On 1/25/2018 5:06 PM, Junio C Hamano wrote: Derrick Stolee writes: Add document specifying the binary format for packed graphs. This format allows for: * New versions. * New hash functions and hash lengths. * Optional extensions. Basic header information is followed by a

Re: [PATCH 03/14] packed-graph: create git-graph builtin

2018-01-26 Thread Derrick Stolee
On 1/25/2018 6:01 PM, Junio C Hamano wrote: Derrick Stolee writes: Teach Git the 'graph' builtin that will be used for writing and reading packed graph files. The current implementation is mostly empty, except for a check that the core.graph setting is enabled and a

Re: [PATCH 03/14] packed-graph: create git-graph builtin

2018-01-26 Thread Derrick Stolee
On 1/25/2018 4:45 PM, Stefan Beller wrote: On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: Teach Git the 'graph' builtin that will be used for writing and reading packed graph files. The current implementation is mostly empty, except for a check that the core.graph

Re: [PATCH 02/14] packed-graph: add core.graph setting

2018-01-26 Thread Derrick Stolee
On 1/25/2018 4:43 PM, Junio C Hamano wrote: Derrick Stolee writes: The packed graph feature is controlled by the new core.graph config setting. This defaults to 0, so the feature is opt-in. The intention of core.graph is that a user can always stop checking for or parsing

Re: [PATCH 01/14] graph: add packed graph design document

2018-01-26 Thread Derrick Stolee
On 1/25/2018 4:14 PM, Junio C Hamano wrote: Derrick Stolee writes: Add Documentation/technical/packed-graph.txt with details of the planned packed graph feature, including future plans. Signed-off-by: Derrick Stolee ---

Re: [PATCH 01/14] graph: add packed graph design document

2018-01-26 Thread Derrick Stolee
On 1/25/2018 3:04 PM, Stefan Beller wrote: On Thu, Jan 25, 2018 at 6:02 AM, Derrick Stolee wrote: Add Documentation/technical/packed-graph.txt with details of the planned packed graph feature, including future plans. Signed-off-by: Derrick Stolee ---

[PATCH 03/10] t6022: don't run 'git merge' upstream of a pipe

2018-01-26 Thread SZEDER Gábor
The primary purpose of 't6022-merge-rename.sh' is to test 'git merge', but one of the tests runs it upstream of a pipe, hiding its exit code. Consequently, the test could continue even if 'git merge' exited with error. Use an intermediate file between 'git merge' and 'test_i18ngrep' to catch a

[PATCH 02/10] t5812: add 'test_i18ngrep's missing filename parameter

2018-01-26 Thread SZEDER Gábor
The second 'test_i18ngrep' invocation in the test 'curl redirects respect whitelist' is missing its filename parameter. This has remained unnoticed since its introduction in f4113cac0 (http: limit redirection to protocol-whitelist, 2015-09-22), because it would only cause the test to fail if Git

[PATCH 00/10] 'test_i18ngrep'-related fixes and improvements

2018-01-26 Thread SZEDER Gábor
When 'test_i18ngrep' can't find the expected pattern, it exits completely silently; when its negated form does find the pattern that shouldn't be there, it prints the matching line(s) but otherwise exits without any error message. This leaves the developer puzzled about what could have gone

[PATCH 09/10] t: make sure that 'test_i18ngrep' got enough parameters

2018-01-26 Thread SZEDER Gábor
Two of the previous patches in this series fixed two bogus 'test_i18ngrep' invocations that had neither a filename parameter not anything piped into their standard input, yet both managed to remain unnoticed for years. A third similarly bogus invocation is currently lurking in 'pu' for a couple

[PATCH 06/10] t5536: let 'test_i18ngrep' read the file without redirection

2018-01-26 Thread SZEDER Gábor
Redirecting 'test_i18ngrep's standard input from a file will interfere with the linting that will be added in a later patch. Signed-off-by: SZEDER Gábor --- t/t5536-fetch-conflicts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH 08/10] t: forbid piping into 'test_i18ngrep'

2018-01-26 Thread SZEDER Gábor
When checking a git command's output with 'test_i18ngrep', it's tempting to conveniently pipe the git command's standard output into 'test_i18ngrep'. Unfortunately, this is an anti-pattern, because it hides the git command's exit code, and the test could continue even if the command exited with

[PATCH 04/10] t4001: don't run 'git status' upstream of a pipe

2018-01-26 Thread SZEDER Gábor
The primary purpose of three tests in 't4001-diff-rename.sh' is to check rename detection in 'git status', but all three do so by running 'git status' upstream of a pipe, hiding its exit code. Consequently, the test could continue even if 'git status' exited with error. Use an intermediate file

[PATCH 10/10] t: make 'test_i18ngrep' more informative on failure

2018-01-26 Thread SZEDER Gábor
When 'test_i18ngrep' can't find the expected pattern, it exits completely silently; when its negated form does find the pattern that shouldn't be there, it prints the matching line(s) but otherwise exits without any error message. This leaves the developer puzzled about what could have gone

[PATCH 01/10] t5541: add 'test_i18ngrep's missing filename parameter

2018-01-26 Thread SZEDER Gábor
The test 'push --no-progress silences progress but not status' runs 'test_i18ngrep' without specifying a filename parameter. This has remained unnoticed since its introduction in e304aeba2 (t5541: test more combinations of --progress, 2012-05-01), because that 'test_i18ngrep' is supposed to check

  1   2   >