Re: [PATCH] t3404: fix use of "VAR=VAL cmd" with a shell function

2018-07-12 Thread Eric Sunshine
On Thu, Jul 12, 2018 at 7:52 PM Jeff King wrote: > (I do agree that being able to automatically catch these with a linter > would be worth brain cycles, but I cannot immediately think a of a way > to do so). Perhaps something like this[1]? [1]:

[PATCH 2/4] t/check-non-portable-shell: stop being so polite

2018-07-12 Thread Eric Sunshine
Error messages emitted by this linting script are long and noisy, consisting of several sections: :: error: : Many problem explanations ask the reader to "please" use a suggested alternative, however, such politeness is unnecessary and just adds to the noise and length of the line, so drop

[PATCH 4/4] t/check-non-portable-shell: detect "FOO=bar shell_func"

2018-07-12 Thread Eric Sunshine
One-shot environment variable assignments, such as 'FOO' in "FOO=bar cmd", exist only during the invocation of 'cmd'. However, if 'cmd' happens to be a shell function, then 'FOO' is assigned in the executing shell itself, and that assignment remains until the process exits (unless explicitly

[PATCH 3/4] t/check-non-portable-shell: make error messages more compact

2018-07-12 Thread Eric Sunshine
Error messages emitted by this linting script are long and noisy, consisting of several sections: :: error: : The line of failed shell text, usually coming from within a test body, is often indented by one or two TABs, with the result that the actual (important) text is separated from by a

[PATCH 1/4] t6046/t9833: fix use of "VAR=VAL cmd" with a shell function

2018-07-12 Thread Eric Sunshine
Unlike "FOO=bar cmd" one-shot environment variable assignments which exist only for the invocation of 'cmd', those assigned by "FOO=bar shell_func" exist within the running shell and continue to do so until the process exits (or are explicitly unset). It is unlikely that this behavior was intended

[PATCH 0/4] test-lint: detect one-shot "FOO=bar shell_func"

2018-07-12 Thread Eric Sunshine
One-shot "FOO=bar cmd" environment variable assignments exist only during invocation of 'cmd'. However, if 'cmd' is a shell function, then the variable is assigned in the running shell and exists until the process exits (or is unset explicitly). Such a side-effect is almost certainly unintended by

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you i asked before and i still await your positive response thanks

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you i asked before and i still await your positive response thanks

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you i asked before and i still await your positive response thanks

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you i asked before and i still await your positive response thanks

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you i asked before and i still await your positive response thanks

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you i asked before and i still await your positive response thanks

Re: [PATCH v4 16/23] config: create core.multiPackIndex setting

2018-07-12 Thread Derrick Stolee
On 7/12/2018 5:05 PM, Junio C Hamano wrote: Derrick Stolee writes: The core.multiPackIndex config setting controls the multi-pack- index (MIDX) feature. If false, the setting will disable all reads from the multi-pack-index file. Read this config setting in the new

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you i asked before and i still await your positive response thanks

[PATCH 2/2] tag: don't warn if target is missing but promised

2018-07-12 Thread Jonathan Tan
deref_tag() prints a warning if the object that a tag refers to does not exist. However, when a partial clone has an annotated tag from its promisor remote, but not the object that it refers to, printing a warning on such a tag is incorrect. This occurs, for example, when the checkout that

[PATCH 1/2] revision: tolerate promised targets of tags

2018-07-12 Thread Jonathan Tan
In handle_commit(), it is fatal for an annotated tag to point to a non-existent object. --exclude-promisor-objects should relax this rule and allow non-existent objects that are promisor objects, but this is not the case. Update handle_commit() to tolerate this situation. This was observed when

[PATCH 0/2] Annotated tags pointing to missing but promised blobs

2018-07-12 Thread Jonathan Tan
These are based on jt/partial-clone-fsck-connectivity. The patches in jt/partial-clone-fsck-connectivity were motivated by bugs I discovered in partial clones when refs pointed to blobs directly. While continuing to work on this, I noticed issues with annotated tags - that is, refs pointing to

Re: [PATCH] t3404: fix use of "VAR=VAL cmd" with a shell function

2018-07-12 Thread Jeff King
On Thu, Jul 12, 2018 at 01:31:49PM -0700, Junio C Hamano wrote: > >> ...would you want to use test_when_finished here (both for robustness, > >> but also to make it more clear to a reader what's going on)? > > > > Perhaps. > > Yes, but this one ends up to be overly ugly. > > The restoreing of

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you.

Re: [PATCH v4 04/23] multi-pack-index: add 'write' verb

2018-07-12 Thread Eric Sunshine
On Thu, Jul 12, 2018 at 3:40 PM Derrick Stolee wrote: > In anticipation of writing multi-pack-indexes, add a skeleton > 'git multi-pack-index write' subcommand and send the options to a > write_midx_file() method. Also create a skeleton test script that > tests the 'write' subcommand. > >

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you.

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you.

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you.

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you.

Proposal

2018-07-12 Thread Miss Victoria Mehmet
Hello I have a business proposal of mutual benefits i would like to discuss with you.

Re: [PATCH 2/6] git-submodule.sh: rename unused variables

2018-07-12 Thread Junio C Hamano
Stefan Beller writes: > The 'mode' variable is not used in cmd_update for its original purpose, > rename it to 'dummy' as it only serves the purpose to abort quickly > documenting this knowledge. It seems that (1) the while loop in git-submodule.sh we see in this patch is the only thing

Re: [PATCH 1/6] git-submodule.sh: align error reporting for update mode to use path

2018-07-12 Thread Junio C Hamano
Stefan Beller writes: > All other error messages in cmd_update are reporting the submodule based > on its path, so let's do that for invalid update modes, too. > > Signed-off-by: Stefan Beller > --- Makes sense. > git-submodule.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >

Re: [PATCH v4 00/23] Multi-pack-index (MIDX)

2018-07-12 Thread Junio C Hamano
Derrick Stolee writes: > * The global 'core_multi_pack_index' is replaced with a one-time call to > git_config_bool() per repository that loads a multi-pack-index. OK. I guess that is more consistent, as the configuration would be per-repo and multi-pack-index is per object-store. After a

Re: [PATCH v4 16/23] config: create core.multiPackIndex setting

2018-07-12 Thread Junio C Hamano
Derrick Stolee writes: > The core.multiPackIndex config setting controls the multi-pack- > index (MIDX) feature. If false, the setting will disable all reads > from the multi-pack-index file. > > Read this config setting in the new prepare_multi_pack_index_one() > which is called during

Re: [PATCH] RFC: submodule-config: introduce trust level

2018-07-12 Thread Junio C Hamano
Stefan Beller writes: > In practice we always want to stack the settings starting with the > .gitmodules file as a base and then put the config on top of it. Could you substantiate this claim with justification? Thanks.

Re: [PATCH] sequencer.c: terminate the last line of author-script properly

2018-07-12 Thread Junio C Hamano
Junio C Hamano writes: > I _think_ the right and safe way to fix taht is to do something like > this: > > test -f .git/rebase-merge/author-script && > ( > safe_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL ... && > eval "$(cat .git/rebase-merge/author-script)" &&

Re: [PATCH v3] handle lower case drive letters on Windows

2018-07-12 Thread Junio C Hamano
Ben Peart writes: >> > Thanks. I thought it was strange as well until I realized you only >> > see the error message if there _isn't_ a valid drive letter so seeing >> > the entire path makes sense as it will likely be something like >> "\\server\volume\directory" >> >> Yup, that is why I

Re: [PATCH] t3404: fix use of "VAR=VAL cmd" with a shell function

2018-07-12 Thread Junio C Hamano
Junio C Hamano writes: >>> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh >>> index 7e9f375a24..fd43443ff5 100755 >>> --- a/t/t3404-rebase-interactive.sh >>> +++ b/t/t3404-rebase-interactive.sh >>> @@ -280,8 +280,11 @@ test_expect_success 'retain authorship w/

Re: [PATCH] t3404: fix use of "VAR=VAL cmd" with a shell function

2018-07-12 Thread Junio C Hamano
Jeff King writes: > On Thu, Jul 12, 2018 at 01:07:51PM -0700, Junio C Hamano wrote: > >> Bash may take it happily but running test with dash reveals a breakage. >> >> This was not discovered for a long time as no tests after this test >> depended on GIT_AUTHOR_NAME to be reverted correctly back

Re: [PATCH] sequencer.c: terminate the last line of author-script properly

2018-07-12 Thread Junio C Hamano
Yup ;-) On Thu, Jul 12, 2018 at 1:16 PM, Eric Sunshine wrote: > On Thu, Jul 12, 2018 at 4:13 PM Junio C Hamano wrote: >> I _think_ the right and safe way to fix taht is to do something like >> this: >> >> test -f .git/rebase-merge/author-script && >> ( >>

Re: [PATCH] sequencer.c: terminate the last line of author-script properly

2018-07-12 Thread Eric Sunshine
On Thu, Jul 12, 2018 at 4:13 PM Junio C Hamano wrote: > I _think_ the right and safe way to fix taht is to do something like > this: > > test -f .git/rebase-merge/author-script && > ( > safe_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL ... && s/safe_unset/sane_unset/ >

Re: [PATCH] t3404: fix use of "VAR=VAL cmd" with a shell function

2018-07-12 Thread Jeff King
On Thu, Jul 12, 2018 at 01:07:51PM -0700, Junio C Hamano wrote: > Bash may take it happily but running test with dash reveals a breakage. > > This was not discovered for a long time as no tests after this test > depended on GIT_AUTHOR_NAME to be reverted correctly back to the > original value

Re: [PATCH] sequencer.c: terminate the last line of author-script properly

2018-07-12 Thread Junio C Hamano
"Akinori MUSHA" writes: > diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh > index 352a52e59..345b103eb 100755 > --- a/t/t3404-rebase-interactive.sh > +++ b/t/t3404-rebase-interactive.sh > @@ -75,6 +75,19 @@ test_expect_success 'rebase --keep-empty' ' >

RE: [PATCH v3] handle lower case drive letters on Windows

2018-07-12 Thread Ben Peart
> > Thanks. I thought it was strange as well until I realized you only > > see the error message if there _isn't_ a valid drive letter so seeing > > the entire path makes sense as it will likely be something like > "\\server\volume\directory" > > Yup, that is why I thought Dscho meant to say

[PATCH] t3404: fix use of "VAR=VAL cmd" with a shell function

2018-07-12 Thread Junio C Hamano
Bash may take it happily but running test with dash reveals a breakage. This was not discovered for a long time as no tests after this test depended on GIT_AUTHOR_NAME to be reverted correctly back to the original value after this step is done. Signed-off-by: Junio C Hamano --- * We could

Re: [PATCH v2] sha1-name.c: for ":/", find detached HEAD commits

2018-07-12 Thread William Chargin
Contents look good to me. I don't understand why the file name in your patch is sha1_name.c as opposed to sha1-name.c (I see e5e5e0883 from 2018-04-10, but that sounds pretty old), but I trust that whatever you're doing there is correct. > Thanks for working on this. You're quite welcome. Thanks

Re: [PATCH v2 01/10] t/test-lib: teach --chain-lint to detect broken &&-chains in subshells

2018-07-12 Thread Junio C Hamano
Eric Sunshine writes: > However, existing tests aside, the more important goal is detecting > problems in new or updated tests hiding genuine bugs in changes to Git > itself, so it may have some value. Yes, indeed.

Re: [PATCH v3] handle lower case drive letters on Windows

2018-07-12 Thread Junio C Hamano
Ben Peart writes: >> -Original Message- >> From: Junio C Hamano On Behalf Of Junio C Hamano >> Sent: Thursday, July 12, 2018 3:13 PM >> To: Ben Peart >> Cc: git@vger.kernel.org; sbel...@google.com; johannes.schinde...@gmx.de >> Subject: Re: [PATCH v3] handle lower case drive letters on

[PATCH 3/6] builtin/submodule--helper: factor out submodule updating

2018-07-12 Thread Stefan Beller
Separate the command line parsing from the actual execution of the command within the repository. For now there is not a lot of execution as most of it is still in git-submodule.sh. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 59 + 1 file

[PATCH 4/6] builtin/submodule--helper: store update_clone information in a struct

2018-07-12 Thread Stefan Beller
The information that is printed for update_submodules in 'submodule--helper update-clone' and consumed by 'git submodule update' is stored as a string per submodule. This made sense at the time of 48308681b07 (git submodule update: have a dedicated helper for cloning, 2016-02-29), but as we want

[PATCH 2/6] git-submodule.sh: rename unused variables

2018-07-12 Thread Stefan Beller
The 'mode' variable is not used in cmd_update for its original purpose, rename it to 'dummy' as it only serves the purpose to abort quickly documenting this knowledge. The variable 'stage' is also not used any more in cmd_update, so remove it. This went unnoticed as first each function used the

[PATCH 5/6] builtin/submodule--helper: factor out method to update a single submodule

2018-07-12 Thread Stefan Beller
In a later patch we'll find this method handy. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index c9c3fe2bf28..4bbf580df79 100644

[PATCH 1/6] git-submodule.sh: align error reporting for update mode to use path

2018-07-12 Thread Stefan Beller
All other error messages in cmd_update are reporting the submodule based on its path, so let's do that for invalid update modes, too. Signed-off-by: Stefan Beller --- git-submodule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-submodule.sh b/git-submodule.sh index

[PATCH 6/6] submodule--helper: introduce new update-module-mode helper

2018-07-12 Thread Stefan Beller
This chews off a bit of the shell part of the update command in git-submodule.sh. When writing the C code, keep in mind that the submodule--helper part will go away eventually and we want to have a C function that is able to determine the submodule update strategy, it as a nicety, make

[PATCH 0/6] git-submodule.sh: convert part of cmd_update to C

2018-07-12 Thread Stefan Beller
I thought about writing it all in one go, but the series got too large, so let's chew one bite at a time. Thanks, Stefan Stefan Beller (6): git-submodule.sh: align error reporting for update mode to use path git-submodule.sh: rename unused variables builtin/submodule--helper: factor out

[PATCH v4 22/23] packfile: skip loading index if in multi-pack-index

2018-07-12 Thread Derrick Stolee
Signed-off-by: Derrick Stolee --- packfile.c | 19 +-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/packfile.c b/packfile.c index 2c819a0ad8..e6ecf12ab5 100644 --- a/packfile.c +++ b/packfile.c @@ -469,8 +469,19 @@ static int open_packed_git_1(struct packed_git

[PATCH v4 23/23] midx: clear midx on repack

2018-07-12 Thread Derrick Stolee
If a 'git repack' command replaces existing packfiles, then we must clear the existing multi-pack-index before moving the packfiles it references. Signed-off-by: Derrick Stolee --- builtin/repack.c| 9 + midx.c | 12 midx.h

[PATCH v4 19/23] midx: use existing midx when writing new one

2018-07-12 Thread Derrick Stolee
Due to how Windows handles replacing a lockfile when there is an open handle, create the close_midx() method to close the existing midx before writing the new one. Signed-off-by: Derrick Stolee --- midx.c | 116 ++--- midx.h | 1 + 2 files

[PATCH v4 21/23] midx: prevent duplicate packfile loads

2018-07-12 Thread Derrick Stolee
The multi-pack-index, when present, tracks the existence of objects and their offsets within a list of packfiles. This allows us to use the multi-pack-index for object lookups, abbreviations, and object counts. When the multi-pack-index tracks a packfile, then we do not need to add that packfile

[PATCH v4 09/23] multi-pack-index: read packfile list

2018-07-12 Thread Derrick Stolee
When constructing a multi-pack-index file for a given object directory, read the files within the enclosed pack directory and find matches that end with ".idx" and find the correct paired packfile using add_packed_git(). Signed-off-by: Derrick Stolee --- midx.c | 48

[PATCH v4 13/23] midx: write object ids in a chunk

2018-07-12 Thread Derrick Stolee
Signed-off-by: Derrick Stolee --- Documentation/technical/pack-format.txt | 4 +++ midx.c | 47 +++-- midx.h | 1 + t/helper/test-read-midx.c | 2 ++ t/t5319-multi-pack-index.sh |

[PATCH v4 16/23] config: create core.multiPackIndex setting

2018-07-12 Thread Derrick Stolee
The core.multiPackIndex config setting controls the multi-pack- index (MIDX) feature. If false, the setting will disable all reads from the multi-pack-index file. Read this config setting in the new prepare_multi_pack_index_one() which is called during prepare_packed_git(). This check is run once

[PATCH v4 18/23] midx: use midx in abbreviation calculations

2018-07-12 Thread Derrick Stolee
Signed-off-by: Derrick Stolee --- midx.c | 11 + midx.h | 3 +++ packfile.c | 6 + packfile.h | 1 + sha1-name.c | 70 + 5 files changed, 91 insertions(+) diff --git a/midx.c b/midx.c index 182535933c..4e014ff6e3

[PATCH v4 08/23] packfile: generalize pack directory list

2018-07-12 Thread Derrick Stolee
In anticipation of sharing the pack directory listing with the multi-pack-index, generalize prepare_packed_git_one() into for_each_file_in_pack_dir(). Signed-off-by: Derrick Stolee --- packfile.c | 101 + packfile.h | 6 2 files

[PATCH v4 17/23] midx: read objects from multi-pack-index

2018-07-12 Thread Derrick Stolee
Signed-off-by: Derrick Stolee --- midx.c | 91 +- midx.h | 3 ++ packfile.c | 8 - 3 files changed, 100 insertions(+), 2 deletions(-) diff --git a/midx.c b/midx.c index 4090cf4ca4..182535933c 100644 --- a/midx.c +++ b/midx.c @@

[PATCH v4 12/23] midx: sort and deduplicate objects from packfiles

2018-07-12 Thread Derrick Stolee
Before writing a list of objects and their offsets to a multi-pack-index, we need to collect the list of objects contained in the packfiles. There may be multiple copies of some objects, so this list must be deduplicated. It is possible to artificially get into a state where there are many

[PATCH v4 20/23] midx: use midx in approximate_object_count

2018-07-12 Thread Derrick Stolee
Signed-off-by: Derrick Stolee --- packfile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packfile.c b/packfile.c index c0eb5ac885..97e7812b6b 100644 --- a/packfile.c +++ b/packfile.c @@ -861,10 +861,13 @@ unsigned long approximate_object_count(void) { if

[PATCH v4 15/23] midx: write object offsets

2018-07-12 Thread Derrick Stolee
The final pair of chunks for the multi-pack-index file stores the object offsets. We default to using 32-bit offsets as in the pack-index version 1 format, but if there exists an offset larger than 32-bits, we use a trick similar to the pack-index version 2 format by storing all offsets at least

[PATCH v4 14/23] midx: write object id fanout chunk

2018-07-12 Thread Derrick Stolee
Signed-off-by: Derrick Stolee --- Documentation/technical/pack-format.txt | 5 +++ midx.c | 53 +++-- midx.h | 1 + t/helper/test-read-midx.c | 4 +- t/t5319-multi-pack-index.sh |

[PATCH v4 11/23] midx: read pack names into array

2018-07-12 Thread Derrick Stolee
Signed-off-by: Derrick Stolee --- midx.c | 17 + midx.h | 1 + t/helper/test-read-midx.c | 5 + t/t5319-multi-pack-index.sh | 17 - 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/midx.c b/midx.c

[PATCH v4 10/23] multi-pack-index: write pack names in chunk

2018-07-12 Thread Derrick Stolee
The multi-pack-index needs to track which packfiles it indexes. Store these in our first required chunk. Since filenames are not well structured, add padding to keep good alignment in later chunks. Modify the 'git multi-pack-index read' subcommand to output the existence of the pack-file name

[PATCH v4 07/23] t5319: expand test data

2018-07-12 Thread Derrick Stolee
As we build the multi-pack-index file format, we want to test the format on real repositories. Add tests that create repository data including multiple packfiles with both version 1 and version 2 formats. The current 'git multi-pack-index write' command will always write the same file with no

[PATCH v4 05/23] midx: write header information to lockfile

2018-07-12 Thread Derrick Stolee
As we begin writing the multi-pack-index format to disk, start with the basics: the 12-byte header and the 20-byte checksum footer. Start with these basics so we can add the rest of the format in small increments. As we implement the format, we will use a technique to check that our computed

[PATCH v4 04/23] multi-pack-index: add 'write' verb

2018-07-12 Thread Derrick Stolee
In anticipation of writing multi-pack-indexes, add a skeleton 'git multi-pack-index write' subcommand and send the options to a write_midx_file() method. Also create a skeleton test script that tests the 'write' subcommand. Signed-off-by: Derrick Stolee ---

[PATCH v4 06/23] multi-pack-index: load into memory

2018-07-12 Thread Derrick Stolee
Create a new multi_pack_index struct for loading multi-pack-indexes into memory. Create a test-tool builtin for reading basic information about that multi-pack-index to verify the correct data is written. Signed-off-by: Derrick Stolee --- Makefile| 1 + midx.c

[PATCH v4 03/23] multi-pack-index: add builtin

2018-07-12 Thread Derrick Stolee
This new 'git multi-pack-index' builtin will be the plumbing access for writing, reading, and checking multi-pack-index files. The initial implementation is a no-op. Signed-off-by: Derrick Stolee --- .gitignore | 3 ++- Documentation/git-multi-pack-index.txt | 36

[PATCH v4 00/23] Multi-pack-index (MIDX)

2018-07-12 Thread Derrick Stolee
v3 had a lot of interesting feedback, most of which was non-functional, but made a big impact on the shape of the patch, especially the test script. These are the important changes: * 'git multi-pack-index' will report usage if the 'write' verb is not provided, or if extra parameters are

[PATCH v4 01/23] multi-pack-index: add design document

2018-07-12 Thread Derrick Stolee
Signed-off-by: Derrick Stolee --- Documentation/technical/multi-pack-index.txt | 109 +++ 1 file changed, 109 insertions(+) create mode 100644 Documentation/technical/multi-pack-index.txt diff --git a/Documentation/technical/multi-pack-index.txt

[PATCH v4 02/23] multi-pack-index: add format details

2018-07-12 Thread Derrick Stolee
The multi-pack-index feature generalizes the existing pack-index feature by indexing objects across multiple pack-files. Describe the basic file format, using a 12-byte header followed by a lookup table for a list of "chunks" which will be described later. The file ends with a footer containing a

Re: [PATCH v2 01/10] t/test-lib: teach --chain-lint to detect broken &&-chains in subshells

2018-07-12 Thread Eric Sunshine
On Thu, Jul 12, 2018 at 12:56 PM Jeff King wrote: > Like Junio, I'm a little nervous that this is going to end up being a > maintenance burden. People may hit false positives and then be > confronted with this horrible mass of sed to try to figure out what went > wrong [...] A very valid

RE: [PATCH v3] handle lower case drive letters on Windows

2018-07-12 Thread Ben Peart
> -Original Message- > From: Junio C Hamano On Behalf Of Junio C Hamano > Sent: Thursday, July 12, 2018 3:13 PM > To: Ben Peart > Cc: git@vger.kernel.org; sbel...@google.com; johannes.schinde...@gmx.de > Subject: Re: [PATCH v3] handle lower case drive letters on Windows > > Ben Peart

Re: [PATCH v3] handle lower case drive letters on Windows

2018-07-12 Thread Junio C Hamano
Ben Peart writes: > On Windows, if a tool calls SetCurrentDirectory with a lower case drive > letter, the subsequent call to GetCurrentDirectory will return the same > lower case drive letter. Powershell, for example, does not normalize the > path. If that happens, test-drop-caches will error

Re: [PATCH v2] sha1-name.c: for ":/", find detached HEAD commits

2018-07-12 Thread Junio C Hamano
William Chargin writes: >> As we discussed during the review on v1, ":/" >> is *NOT* pathspec (that is why having these tests in t4208 is wrong >> but we are following existing mistakes). > > Ah, I understand the terminology better now. Thanks. I'll change the > commit message wording to use

[PATCH] RFC: submodule-config: introduce trust level

2018-07-12 Thread Stefan Beller
The series merged at 614ea03a71e (Merge branch 'bw/submodule-config-cleanup', 2017-08-26) went to great length to make it explicit to the caller where a value came from, as that would help the caller to be careful to decide which values to take from where, i.e. be careful about security

gitweb and Levenshtein

2018-07-12 Thread David Brown
Howdy, I want to hack the getweb_make_index.perl script to create a string search using: https://github.com/git/git/blob/master/levenshtein.c. How do i reference the compiled code? I would like to call this routine using Java and maybe Perl. Please advise. Thanks. Regards,

Re: [PATCH 21/25] t5000-t5999: fix broken &&-chains

2018-07-12 Thread Eric Sunshine
On Thu, Jul 12, 2018 at 2:50 PM Junio C Hamano wrote: > Eric Sunshine writes: > > The exact reason is that the prerequisite was not met (indeed, I > > wasn't even aware of that prerequisite), so the commit message can be > > more direct: > > > > This was missed by the previous clean-ups due

Re: [PATCH 21/25] t5000-t5999: fix broken &&-chains

2018-07-12 Thread Junio C Hamano
Eric Sunshine writes: > On Thu, Jul 12, 2018 at 2:35 PM Junio C Hamano wrote: >> Junio C Hamano writes: >> Oops, sent before completing the message. >> >> For that to happen, we need a sign-off ;-) >> >> I guess this one would have been caught with the "sed script on >> subshell"

Re: [PATCH] t6036: fix broken && chain in sub-shell

2018-07-12 Thread Junio C Hamano
Ramsay Jones writes: > Signed-off-by: Ramsay Jones > --- > > Hi Junio, > > I had a test failure on 'pu' today - Eric's chain-lint series > found another broken chain in one of Elijah's new tests (on the > 'en/t6036-recursive-corner-cases' branch). Thanks, I see the same breakage in my build,

Re: [PATCH 21/25] t5000-t5999: fix broken &&-chains

2018-07-12 Thread Eric Sunshine
On Thu, Jul 12, 2018 at 2:35 PM Junio C Hamano wrote: > Junio C Hamano writes: > Oops, sent before completing the message. > > For that to happen, we need a sign-off ;-) > > I guess this one would have been caught with the "sed script on > subshell" linter that does not execute? Yes,

Re: [PATCH 21/25] t5000-t5999: fix broken &&-chains

2018-07-12 Thread Junio C Hamano
Junio C Hamano writes: > Eric Sunshine writes: > >> On Thu, Jul 12, 2018 at 8:37 AM SZEDER Gábor wrote: >>> The change below should be squashed into this patch to fix a >>> previously unnoticed broken &&-chain. I think you missed it, because >>> this test script is rather expensive and you

Re: [PATCH 21/25] t5000-t5999: fix broken &&-chains

2018-07-12 Thread Junio C Hamano
Eric Sunshine writes: > On Thu, Jul 12, 2018 at 8:37 AM SZEDER Gábor wrote: >> The change below should be squashed into this patch to fix a >> previously unnoticed broken &&-chain. I think you missed it, because >> this test script is rather expensive and you didn't run it with >>

Re: [GSoC][PATCH v3 12/13] rebase -i: implement the logic to initialize the variable $revision in C

2018-07-12 Thread Junio C Hamano
Junio C Hamano writes: > If I am reading the body of this if() block correctly, I think it > does everything init_revisions_and_shortrevisions shell function > does, i.e. compute $revisions for both cases with or without > upstream and write squash-onto state if needed, so that we can call > the

Re: [PATCH 21/25] t5000-t5999: fix broken &&-chains

2018-07-12 Thread Jeff King
On Thu, Jul 12, 2018 at 01:44:49PM -0400, Eric Sunshine wrote: > On Thu, Jul 12, 2018 at 8:37 AM SZEDER Gábor wrote: > > The change below should be squashed into this patch to fix a > > previously unnoticed broken &&-chain. I think you missed it, because > > this test script is rather expensive

Re: [GSoC][PATCH v3 12/13] rebase -i: implement the logic to initialize the variable $revision in C

2018-07-12 Thread Junio C Hamano
Alban Gruin writes: > @@ -50,6 +71,13 @@ int cmd_rebase__helper(int argc, const char **argv, const > char *prefix) > N_("prepare the branch to be rebased"), > PREPARE_BRANCH), > OPT_CMDMODE(0, "complete-action", , > N_("complete

Re: [PATCH v3 07/24] multi-pack-index: expand test data

2018-07-12 Thread Derrick Stolee
On 7/12/2018 2:02 PM, Eric Sunshine wrote: On Thu, Jul 12, 2018 at 10:10 AM Derrick Stolee wrote: On 7/6/2018 12:36 AM, Eric Sunshine wrote: There seems to be a fair bit of duplication in these tests which create objects. Is it possible to factor out some of this code into a shell function?

Re: [PATCH v3 07/24] multi-pack-index: expand test data

2018-07-12 Thread Eric Sunshine
On Thu, Jul 12, 2018 at 10:10 AM Derrick Stolee wrote: > On 7/6/2018 12:36 AM, Eric Sunshine wrote: > > There seems to be a fair bit of duplication in these tests which > > create objects. Is it possible to factor out some of this code into a > > shell function? > > In addition to the other small

Re: [PATCH 21/25] t5000-t5999: fix broken &&-chains

2018-07-12 Thread Eric Sunshine
On Thu, Jul 12, 2018 at 8:37 AM SZEDER Gábor wrote: > The change below should be squashed into this patch to fix a > previously unnoticed broken &&-chain. I think you missed it, because > this test script is rather expensive and you didn't run it with > GIT_TEST_CLONE_2GB=YesPlease. > > diff

Re: [PATCH v3 0/6] Object store refactoring: commit graph

2018-07-12 Thread Derrick Stolee
On 7/11/2018 6:42 PM, Jonathan Tan wrote: This is on _both_ ds/commit-graph-fsck and sb/object-store-lookup, following Stolee's suggestion. (It also seems better to build it this way to me, since both these branches are going into "next" according to the latest What's Cooking.) Junio wrote in

Re: rev-parse --show-toplevel broken during exec'ed rebase?

2018-07-12 Thread Vitali Lovich
On Thu, Jul 12, 2018 at 8:23 AM Junio C Hamano wrote: > > Vitali Lovich writes: > > > Repro (starting with cwd within git project): > >> (cd xdiff; git rev-parse --show-toplevel) > > ... path to git repository > >> git rebase -i 18404434bf406f6a6f892ed73320c5cf9cc187dd > > # Stop at some commit

Re: [PATCH v3 16/24] config: create core.multiPackIndex setting

2018-07-12 Thread Junio C Hamano
SZEDER Gábor writes: >> Thanks for this point. It seems to work using >> "link:technical/multi-pack-index[1]", which is what I'll use in the next >> version. > > It doesn't work, it merely works around the build failure. Sorry. I fell into the same trap X-<.

Re: [PATCH] sequencer.c: terminate the last line of author-script properly

2018-07-12 Thread Junio C Hamano
"Akinori MUSHA" writes: > It looks like write_author_script() intends to write out a file in > Bourne shell syntax, but it doesn't put a closing single quote on the > last line. s/closing single quote/& and the terminating newline/? > > This patch makes .git/rebase-merge/author-script actually

Re: [PATCH 0/2] Fix --rebase-merges with custom commentChar

2018-07-12 Thread Junio C Hamano
Aaron Schrab writes: > Subject: [PATCH v2] sequencer: use configured comment character > > Use the configured comment character when generating comments about > branches in a todo list. Failure to honor this configuration causes a > failure to parse the resulting todo list. OK. > > Note that

Re: [PATCH] ref-filter: mark some file-local symbols as static

2018-07-12 Thread Оля Тележная
2018-07-12 18:57 GMT+03:00 Ramsay Jones : > > Signed-off-by: Ramsay Jones > --- > > Hi Olga, > > If you need to re-roll your 'ot/ref-filter-object-info' branch, > could you please squash this into the relevant patch (commit c5d9a471d6, > "ref-filter: use oid_object_info() to get object",

Re: refs/notes/amlog problems, was Re: [PATCH v3 01/20] linear-assignment: a function to solve least-cost assignment problems

2018-07-12 Thread Junio C Hamano
Johannes Schindelin writes: > I would like to ask you to reinstate the post-rewrite hook, as it still > improves the situation over the current one. Without post-rewrite I seem to be getting correct amlog entries for commits created by "git rebase"; do our rebase--am backend still trigger

Re: [PATCH v2 01/10] t/test-lib: teach --chain-lint to detect broken &&-chains in subshells

2018-07-12 Thread Jeff King
On Thu, Jul 12, 2018 at 06:50:20AM -0400, Eric Sunshine wrote: > And, perhaps most important: We're not tied indefinitely to the > "subset" implemented by the current linter. If it is indeed found to > be too strict or limiting, it can always be loosened or retired > altogether. Yeah, I agree

  1   2   >