Re: [PATCH v7 1/3] tests: Adjust the configuration for Apache 2.2

2016-05-09 Thread Johannes Schindelin
Hi Junio, On Mon, 9 May 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Okay, I already force-pushed my extra-http-header branch and the next > > iteration will sport this paragraph. > > The new explanation is well written and can and should also replace the > comment before th

Re: [PATCH] wt-status.c: set commitable bit if there is a meaningful merge.

2016-05-09 Thread Stephen & Linda Smith
On Tuesday, February 16, 2016 07:33:54 PM Junio C Hamano wrote: > > --- > > I think I mislead you into a slightly wrong direction. While the > single liner does improve the situation, I think this is merely a > band-aid upon closer inspection. For example, if you changed your > "commit --dry-run

Re: [PATCH v7 1/3] tests: Adjust the configuration for Apache 2.2

2016-05-09 Thread Lars Schneider
> On 09 May 2016, at 08:18, Johannes Schindelin > wrote: > > Lars Schneider noticed that the configuration introduced to test the extra > HTTP headers cannot be used with Apache 2.2 (which is still actively > maintained, as pointed out by Junio Hamano). > > To let the tests pass with Apache 2.

Re: [PATCH 4/6] t1500: avoid setting configuration options outside of tests

2016-05-09 Thread Eric Sunshine
On Tue, May 10, 2016 at 1:20 AM, Eric Sunshine wrote: > Ideally, each test should be responsible for setting up state it needs > rather than relying upon transient global state. Toward this end, teach > test_rev_parse() to accept a "-b " option to allow callers to set > "core.bare" explicitly or u

Re: What's cooking in git.git (May 2016, #02; Fri, 6)

2016-05-09 Thread Lars Schneider
> On 07 May 2016, at 00:46, Junio C Hamano wrote: > > [...] > > > * jc/doc-lint (2016-05-04) 2 commits > - Documentation: fix linkgit references > - ci: validate "gitlink:" in documentation The first patch "Documentation: fix linkgit references" seems not to be on the jc/doc-lint branch? A v

Re: [PATCH 0/6] modernize t1500

2016-05-09 Thread Junio C Hamano
Eric Sunshine writes: > This series modernizes t1500; it takes an entirely different approach > than [1][2] and is intended to replace that series. Turns out that it wasn't so painful after all. The only small niggle I have is on 6/6; my preference would be, because once we set up .git we do no

Re: [PATCH v2] t6302: simplify non-gpg cases

2016-05-09 Thread Junio C Hamano
Jeff King writes: > [+cc Junio as this should be the final version] Thanks, I think I queued with "do not cat a single file to a pipe" tweak already. >> > When commit 618310a taught t6302 to run without the GPG >> >> 618310a (t6302: skip only signed tags rather than all tests when GPG >> is mi

Re: What's cooking in git.git (May 2016, #02; Fri, 6)

2016-05-09 Thread Johannes Schindelin
Hi Junio, On Fri, 6 May 2016, Junio C Hamano wrote: > * jc/fsck-nul-in-commit (2016-04-14) 2 commits > - fsck: detect and warn a commit with embedded NUL > - fsck_commit_buffer(): do not special case the last validation > > "git fsck" learned to catch NUL byte in a commit object as > potenti

Re: What's cooking in git.git (May 2016, #02; Fri, 6)

2016-05-09 Thread Johannes Schindelin
Hi Junio, On Fri, 6 May 2016, Junio C Hamano wrote: > * jk/submodule-c-credential (2016-05-06) 6 commits > - submodule: stop sanitizing config options > - submodule: use prepare_submodule_repo_env consistently > - submodule--helper: move config-sanitizing to submodule.c > - submodule: export

Re: What's cooking in git.git (May 2016, #03; Mon, 9)

2016-05-09 Thread Pranit Bauva
On Tue, May 10, 2016 at 4:30 AM, Junio C Hamano wrote: > * pb/commit-verbose-config (2016-05-05) 8 commits > - SQUASH??? > - commit: add a commit.verbose config variable > - t7507-commit-verbose: improve test coverage by testing number of diffs > - parse-options.c: make OPTION_COUNTUP respect

[PATCH 2/6] t1500: reduce dependence upon global state

2016-05-09 Thread Eric Sunshine
This script pollutes its global state by changing its working directory and capturing that state via $(pwd) in the GIT_CONFIG environment variable. This makes it difficult to modernize the script since tests ideally should be self-contained and not rely upon such transient global state. With the u

[PATCH 5/6] t1500: avoid setting environment variables outside of tests

2016-05-09 Thread Eric Sunshine
Ideally, each test should be responsible for setting up state it needs rather than relying upon transient global state. Toward this end, teach test_rev_parse() to accept a "-g " option to allow callers to specify the value of the GIT_DIR environment variable explicitly, and take advantage of this n

[PATCH 3/6] t1500: avoid changing working directory outside of tests

2016-05-09 Thread Eric Sunshine
Ideally, each test should be responsible for setting up state it needs rather than relying upon transient global state. Toward this end, teach test_rev_parse() to accept a "-C " option to allow callers to instruct it explicitly in which directory its tests should be run, and take advantage of this

[PATCH 6/6] t1500: be considerate to future potential tests

2016-05-09 Thread Eric Sunshine
The final batch of git-rev-parse tests work against a non-local object database named ../repo.git rather than the typically-named ../.git. It prepares by renaming .git/ to repo.git/ and pointing GIT_DIR at ../repo.git, but never restores the name to .git/, which can be problematic for tests added i

[PATCH 1/6] t1500: test_rev_parse: facilitate future test enhancements

2016-05-09 Thread Eric Sunshine
Tests run by test_rev_parse() are nearly identical; each invokes git-rev-parse with a single option and compares the result against an expected value. Such duplication makes it onerous to extend the tests since any change needs to be repeated in each test. Reduce the duplication by parameterizing t

[PATCH 0/6] modernize t1500

2016-05-09 Thread Eric Sunshine
This series modernizes t1500; it takes an entirely different approach than [1][2] and is intended to replace that series. Whereas [1][2] dropped the systematic function-driven testing of git-rev-parse in favor of dozens of nearly identical copy/paste tests, this series retains the structure of the

[PATCH 4/6] t1500: avoid setting configuration options outside of tests

2016-05-09 Thread Eric Sunshine
Ideally, each test should be responsible for setting up state it needs rather than relying upon transient global state. Toward this end, teach test_rev_parse() to accept a "-b " option to allow callers to set "core.bare" explicitly or undefine it, and take advantage of this new option to avoid sett

Re: [PATCH v2] t6302: simplify non-gpg cases

2016-05-09 Thread Eric Sunshine
On Mon, May 9, 2016 at 10:40 PM, Jeff King wrote: > On Mon, May 09, 2016 at 01:47:35PM -0400, Eric Sunshine wrote: >> > - test_prepare_expect <<-\EOF | sed -e "s/Z$//" >expect && >> > + cat <<-\EOF | sed -e "s/Z$//" >expect && >> >> To make this as close to a reversion as possible, thi

Re: t6044 broken on pu

2016-05-09 Thread Jeff King
On Mon, May 09, 2016 at 11:36:09AM -0700, Junio C Hamano wrote: > Junio C Hamano writes: > > > Yes, I think the comment should just go. Nobody used that alphabet > > form since it was written in d17cf5f3 (tests: Introduce test_seq, > > 2012-08-04). > > > >> I don't really care either way whethe

[PATCH v2] t6302: simplify non-gpg cases

2016-05-09 Thread Jeff King
[+cc Junio as this should be the final version] On Mon, May 09, 2016 at 01:47:35PM -0400, Eric Sunshine wrote: > > Subject: [PATCH] t6302: simplify non-gpg cases > > > > When commit 618310a taught t6302 to run without the GPG > > 618310a (t6302: skip only signed tags rather than all tests when G

Re: [PATCH v9 00/19] index-helper/watchman

2016-05-09 Thread Ramsay Jones
On 10/05/16 00:12, David Turner wrote: > On Mon, 2016-05-09 at 15:32 -0700, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> David Turner writes: >>> On Mon, 2016-05-09 at 14:40 -0700, Junio C Hamano wrote: > Hmmm, I seem to be getting > > $ cat t/trash*7900*/err

Re: [PATCH v9 00/19] index-helper/watchman

2016-05-09 Thread David Turner
On Mon, 2016-05-09 at 15:32 -0700, Junio C Hamano wrote: > Junio C Hamano writes: > > > David Turner writes: > > > > > On Mon, 2016-05-09 at 14:40 -0700, Junio C Hamano wrote: > > > > Hmmm, I seem to be getting > > > > > > > > $ cat t/trash*7900*/err > > > > fatal: Already running > >

What's cooking in git.git (May 2016, #03; Mon, 9)

2016-05-09 Thread Junio C Hamano
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. The 'master' branch now has the te

Re: [PATCH v9 00/19] index-helper/watchman

2016-05-09 Thread Junio C Hamano
Junio C Hamano writes: > David Turner writes: > >> On Mon, 2016-05-09 at 14:40 -0700, Junio C Hamano wrote: >>> Hmmm, I seem to be getting >>> >>> $ cat t/trash*7900*/err >>> fatal: Already running >>> >>> after running t7900 and it fails at #5, after applying >>> "index-helper: option

Re: [PATCH v9 00/19] index-helper/watchman

2016-05-09 Thread Junio C Hamano
David Turner writes: > On Mon, 2016-05-09 at 14:40 -0700, Junio C Hamano wrote: >> Hmmm, I seem to be getting >> >> $ cat t/trash*7900*/err >> fatal: Already running >> >> after running t7900 and it fails at #5, after applying >> "index-helper: optionally automatically run" > > It still

Re: [PATCH v9 00/19] index-helper/watchman

2016-05-09 Thread David Turner
On Mon, 2016-05-09 at 14:40 -0700, Junio C Hamano wrote: > Hmmm, I seem to be getting > > $ cat t/trash*7900*/err > fatal: Already running > > after running t7900 and it fails at #5, after applying > "index-helper: optionally automatically run" It still passes for me (with or without USE

Re: [PATCH v2 00/33] Yet more preparation for reference backends

2016-05-09 Thread Junio C Hamano
Michael Haggerty writes: >> The "demonstrate an existing breakage first" order makes it slightly >> easier to review and follow a long series, as it forces the reviewer >> to see the issue first and think about possible avenues to solve it >> for themselves, before seeing a paticular solution. F

Re: [PATCH v2 00/33] Yet more preparation for reference backends

2016-05-09 Thread Michael Haggerty
On 05/09/2016 11:05 PM, Junio C Hamano wrote: > David Turner writes: >> [...] >> I generally like to put the bug fixes before the tests for those fixes >> (so that bisect on the complete suite works). But maybe the git policy >> is different. > > The Git policy only asks not to break bisection.

Re: [PATCH v9 00/19] index-helper/watchman

2016-05-09 Thread Junio C Hamano
Hmmm, I seem to be getting $ cat t/trash*7900*/err fatal: Already running after running t7900 and it fails at #5, after applying "index-helper: optionally automatically run". -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.ker

Re: [PATCH] t6302: simplify non-gpg cases

2016-05-09 Thread Eric Sunshine
On Mon, May 9, 2016 at 4:24 PM, Karthik Nayak wrote: > On Mon, May 9, 2016 at 11:17 PM, Eric Sunshine > wrote: >> Should we cite bc9acea (ref-filter: implement %(if), %(then), and >> %(else) atoms, 2016-04-25) here as an example of a commit for which >> this was problematic (and which indeed brok

Re: t4151 missing quotes

2016-05-09 Thread Eric Sunshine
On Mon, May 9, 2016 at 4:45 PM, Junio C Hamano wrote: > Eric Sunshine writes: >> On Mon, May 9, 2016 at 2:56 PM, Junio C Hamano wrote: >>> Something like this follows Documentation/SubmittingPatches [...] >>> >>> -- >8 -- >>> From: Armin Kunaschik >>> Subject: t4151: make sure argument to 'test

Re: t6044 broken on pu

2016-05-09 Thread Eric Sunshine
On Mon, May 9, 2016 at 5:08 PM, Junio C Hamano wrote: > Subject: [PATCH] test-lib-functions.sh: rewrite test_seq without Perl > > Rewrite the 'seq' imitation only with commands and features > that are typically found as built-in in modern POSIX shells, > instead of relying on Perl to run a single-

Re: t6044 broken on pu

2016-05-09 Thread Junio C Hamano
Junio C Hamano writes: > Stop promising that we may allow using "letters"; this would open an > easier reimplementation that does not rely on $PERL, if somebody > later wants to. > > Signed-off-by: Junio C Hamano And I am not the one who particularly wants to, but here is the previous patch sen

Re: [PATCH v2 00/33] Yet more preparation for reference backends

2016-05-09 Thread Junio C Hamano
David Turner writes: > On Fri, 2016-05-06 at 18:13 +0200, Michael Haggerty wrote: >> Thanks to David, Junio, and Peff for their comments on v1 of this >> patch series [1]. I think I have addressed all of the points that >> were >> brought up. Plus I fixed a pre-existing bug that I noticed myself

[PATCH v9 05/19] index-helper: log warnings

2016-05-09 Thread David Turner
Instead of writing warnings to stderr, write them to a log. Later, we'll probably be daemonized, so writing to stderr will be pointless. Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ index-helper.c | 32 2 files

[PATCH v9 19/19] untracked-cache: config option

2016-05-09 Thread David Turner
Add a config option to populate the untracked cache. For installations that have centrally-managed configuration, it's easier to set a config once than to run update-index on every repository. Signed-off-by: David Turner --- Documentation/config.txt | 4 read-cache.c | 7 ++

[PATCH v9 17/19] index-helper: optionally automatically run

2016-05-09 Thread David Turner
Introduce a new config option, indexhelper.autorun, to automatically run git index-helper before starting up a builtin git command. This enables users to keep index-helper running without manual intervention. Signed-off-by: David Turner --- Documentation/config.txt | 4 read-cache.c

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

2016-05-09 Thread David Turner
From: 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). To sum up the effort of making git scale

[PATCH v9 04/19] index-helper: add --strict

2016-05-09 Thread David Turner
From: Nguyễn Thái Ngọc Duy There are "holes" in the index-helper approach because the shared memory is not verified again by git. If $USER is compromised, shared memory could be modified. But anyone who could do this could already modify $GIT_DIR/index. A more realistic risk is some bugs in index

[PATCH v9 11/19] update-index: enable/disable watchman support

2016-05-09 Thread David Turner
From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ Documentation/git-update-index.txt | 6 ++ builtin/update-index.c | 16 3 files changed, 25 insertions(+) diff --git a/

[PATCH v9 13/19] watchman: add a config option to enable the extension

2016-05-09 Thread David Turner
For installations that have centrally-managed configuration, it's easier to set a config once than to run update-index on every repository. Signed-off-by: David Turner --- .gitignore| 1 + Documentation/config.txt | 4 Makefile | 1 + read-ca

[PATCH v9 10/19] index-helper: use watchman to avoid refreshing index with lstat()

2016-05-09 Thread David Turner
From: Nguyễn Thái Ngọc Duy Watchman is hidden behind index-helper. Before git tries to read the index from shm, it notifies index-helper through the socket and waits for index-helper to prepare a file for sharing memory (with MAP_SHARED). index-helper then contacts watchman, updates 'WAMA' extens

[PATCH v9 16/19] index-helper: autorun mode

2016-05-09 Thread David Turner
Soon, we'll want to automatically start index-helper, so we need a mode that silently exits if it can't start up (either because it's not in a git dir, or because another one is already running). Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 4 index-helper.c

[PATCH v9 03/19] index-helper: new daemon for caching index and related stuff

2016-05-09 Thread David Turner
From: Nguyễn Thái Ngọc Duy Instead of reading the index from disk and worrying about disk corruption, the index is cached in memory (memory bit-flips happen too, but hopefully less often). The result is faster read. Read time is reduced by 70%. The biggest gain is not having to verify the traili

[PATCH v9 15/19] index-helper: don't run if already running

2016-05-09 Thread David Turner
Signed-off-by: David Turner --- index-helper.c | 7 +++ t/t7900-index-helper.sh | 9 + 2 files changed, 16 insertions(+) diff --git a/index-helper.c b/index-helper.c index 4ed1610..b275f6e 100644 --- a/index-helper.c +++ b/index-helper.c @@ -458,6 +458,13 @@ int main(int arg

[PATCH v9 09/19] watchman: support watchman to reduce index refresh cost

2016-05-09 Thread David Turner
From: Nguyễn Thái Ngọc Duy The previous patch has the logic to clear bits in 'WAMA' bitmap. This patch has logic to set bits as told by watchman. The missing bit, _using_ these bits, are not here yet. A lot of this code is written by David Turner originally, mostly from [1]. I'm just copying and

[PATCH v9 14/19] index-helper: kill mode

2016-05-09 Thread David Turner
Add a new command (and command-line arg) to allow index-helpers to exit cleanly. This is mainly useful for tests. Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ index-helper.c | 31 ++- t/t7900-index-helper.sh

[PATCH v9 01/19] read-cache.c: fix constness of verify_hdr()

2016-05-09 Thread David Turner
From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index d9fb78b..16cc487 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1345,7 +1345,7 @@

[PATCH v9 02/19] read-cache: allow to keep mmap'd memory after reading

2016-05-09 Thread David Turner
From: Nguyễn Thái Ngọc Duy Later, we will introduce git index-helper to share this memory with other git processes. We only unmap it when we discard the index (although the kernel may of course choose to page it out). Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- cache.

[PATCH v9 08/19] read-cache: add watchman 'WAMA' extension

2016-05-09 Thread David Turner
From: Nguyễn Thái Ngọc Duy The extension contains a bitmap, one bit for each entry in the index. If the n-th bit is zero, the n-th entry is considered unchanged, we can ce_mark_uptodate() it without refreshing. If the bit is non-zero and we found out the corresponding file is clean after refresh,

[PATCH v9 12/19] unpack-trees: preserve index extensions

2016-05-09 Thread David Turner
Make git checkout (and other unpack_tree operations) preserve the untracked cache and watchman status. This is valuable for two reasons: 1. Often, an unpack_tree operation will not touch large parts of the working tree, and thus most of the untracked cache will continue to be valid. 2. Even if th

[PATCH v9 07/19] index-helper: add --detach

2016-05-09 Thread David Turner
From: Nguyễn Thái Ngọc Duy We detach after creating and opening the socket, because otherwise we might return control to the shell before index-helper is ready to accept commands. This might lead to flaky tests. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- Documentatio

[PATCH v9 06/19] daemonize(): set a flag before exiting the main process

2016-05-09 Thread David Turner
From: Nguyễn Thái Ngọc Duy This allows signal handlers and atexit functions to realize this situation and not clean up. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- builtin/gc.c | 2 +- cache.h | 2 +- daemon.c | 2 +- setup.c | 4 +++- 4 files changed, 6

[PATCH v9 00/19] index-helper/watchman

2016-05-09 Thread David Turner
Formatting and patch naming fixes from Junio. No substantive changes. David Turner (8): index-helper: log warnings unpack-trees: preserve index extensions watchman: add a config option to enable the extension index-helper: kill mode index-helper: don't run if already running index-hel

Re: t4151 missing quotes

2016-05-09 Thread Junio C Hamano
Eric Sunshine writes: > On Mon, May 9, 2016 at 2:56 PM, Junio C Hamano wrote: >> Something like this follows Documentation/SubmittingPatches [...] >> >> -- >8 -- >> From: Armin Kunaschik >> Subject: t4151: make sure argument to 'test -z' is given >> >> 88d50724 (am --skip: revert changes introd

Re: [PATCH v9 2/6] convert.c: stream and early out

2016-05-09 Thread Junio C Hamano
tbo...@web.de writes: > + if (stats->stat_bits & earlyout) > + break; /* We found what we have been searching for */ Are we sure if our callers are only interested in just one bit at a time? Otherwise, if we want to ensure all of the given bits are set, i

Re: t4151 missing quotes

2016-05-09 Thread Eric Sunshine
On Mon, May 9, 2016 at 2:56 PM, Junio C Hamano wrote: > Something like this follows Documentation/SubmittingPatches [...] > > -- >8 -- > From: Armin Kunaschik > Subject: t4151: make sure argument to 'test -z' is given > > 88d50724 (am --skip: revert changes introduced by failed 3way merge, > 2015

Re: [PATCH v2 00/33] Yet more preparation for reference backends

2016-05-09 Thread David Turner
On Fri, 2016-05-06 at 18:13 +0200, Michael Haggerty wrote: > Thanks to David, Junio, and Peff for their comments on v1 of this > patch series [1]. I think I have addressed all of the points that > were > brought up. Plus I fixed a pre-existing bug that I noticed myself > while adding some more test

Re: t6044 broken on pu

2016-05-09 Thread Eric Sunshine
On Mon, May 9, 2016 at 2:36 PM, Junio C Hamano wrote: > Subject: test-lib-functions.sh: remove misleading comment on test_seq > > We never used the "letters" form since we came up with "test_seq" to > replace use of non-portable "seq" in our test script, which we > introduced it at d17cf5f3 (tests

Re: [PATCH v9 1/6] read-cache: factor out get_sha1_from_index() helper

2016-05-09 Thread Junio C Hamano
tbo...@web.de writes: > +#define get_sha1_from_cache(path) get_sha1_from_index (&the_index, (path)) > #endif Micronit: lose the extra SP; i.e. "get_sha1_from_index(&the_index, (path))". > diff --git a/read-cache.c b/read-cache.c > index d9fb78b..a3ef967 100644 > --- a/read-cache.c > +++ b/read

RE: /* compiler workaround */ - what was the issue?

2016-05-09 Thread Randall S. Becker
On May 9, 2016 3:40 PM Philip Oakley wrote: > From: "Stefan Beller" > > On Fri, May 6, 2016 at 12:57 PM, Junio C Hamano > wrote: > >> Marc Branchaud writes: > >> > >>> On 2016-05-06 02:54 PM, Junio C Hamano wrote: > > I wonder if can we come up with a short and sweet notation to >

Re: /* compiler workaround */ - what was the issue?

2016-05-09 Thread Philip Oakley
From: "Stefan Beller" On Fri, May 6, 2016 at 12:57 PM, Junio C Hamano wrote: Marc Branchaud writes: On 2016-05-06 02:54 PM, Junio C Hamano wrote: I wonder if can we come up with a short and sweet notation to remind futhre readers that this "initialization" is not initializing but merely s

Re: t4151 missing quotes

2016-05-09 Thread Stefan Beller
On Mon, May 9, 2016 at 11:56 AM, Junio C Hamano wrote: > Something like this follows Documentation/SubmittingPatches, except > that it further needs your Sign-off before mine, which I can forge > if you say it is OK. The sign-off is a simple line at the end of the explanation for the patch, which

Re: [PATCH] t6041: do not compress backup tar file

2016-05-09 Thread Stefan Beller
+ cc Jens as he authored both t6041 as well as t3513 in the series leading to ad25da009e2a3730 (2014-07-21, Merge branch 'jl/submodule-tests') On Mon, May 9, 2016 at 11:46 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> diff --git a/t/t6041-bisect-submodule.sh b/t/t6041-bisect-submodule.s

Re: t4151 missing quotes

2016-05-09 Thread Junio C Hamano
Something like this follows Documentation/SubmittingPatches, except that it further needs your Sign-off before mine, which I can forge if you say it is OK. Thanks for a report and an analysis of the issue. -- >8 -- From: Armin Kunaschik Subject: t4151: make sure argument to 'test -z' is given 8

Re: [PATCH] t6041: do not compress backup tar file

2016-05-09 Thread Junio C Hamano
Stefan Beller writes: > diff --git a/t/t6041-bisect-submodule.sh b/t/t6041-bisect-submodule.sh > index c6b7aa6..62b8a2e 100755 > --- a/t/t6041-bisect-submodule.sh > +++ b/t/t6041-bisect-submodule.sh > @@ -8,7 +8,7 @@ test_description='bisect can handle submodules' > git_bisect () { > git s

Re: [PATCH v1 1/1] t5601: Remove trailing space in sed expression

2016-05-09 Thread Junio C Hamano
tbo...@web.de writes: > From: Torsten Bögershausen > > The sed expression for IPv6, "Tested User And Host" or "tuah" used a wrong > sed expression, which doesn't work under all versions of sed. > > Reported-By: Armin Kunaschik > Signed-off-by: Torsten Bögershausen > --- Good. Thanks. > t/t5

Re: t6044 broken on pu

2016-05-09 Thread Junio C Hamano
Junio C Hamano writes: > Yes, I think the comment should just go. Nobody used that alphabet > form since it was written in d17cf5f3 (tests: Introduce test_seq, > 2012-08-04). > >> I don't really care either way whether it is replaced or not (at one >> point there were some people really interest

Re: t6044 broken on pu

2016-05-09 Thread Junio C Hamano
Jeff King writes: > On Mon, May 09, 2016 at 12:02:45PM -0400, Eric Sunshine wrote: > >> > I had that thought, too, but I think it would be an error to do so. >> > test_seq is supposed to be a replacement for "seq", which does not >> > understand non-numeric sequences. >> >> Although, the comment

Re: t6044 broken on pu

2016-05-09 Thread Junio C Hamano
Torsten Bögershausen writes: > On 08.05.16 20:20, Junio C Hamano wrote: >> Torsten Bögershausen writes: >> >>> May a simple >>> printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >>> >>> be an option ? >> If you were to do that, at least have the decency to make it more >> readable by doing something li

Re: t4151 missing quotes

2016-05-09 Thread Armin Kunaschik
I'm currently concentrating on finding problems with my setup... this is already a tough job :-) I'm a git beginner, and Documentation/SubmittingPatches would keep me busy for a week. So anybody feel free to submit this thingy. Armin -- To unsubscribe from this list: send the line "unsubscribe git

Re: t4151 missing quotes

2016-05-09 Thread Eric Sunshine
[please don't top-post on this list] On Mon, May 9, 2016 at 12:35 PM, Armin Kunaschik wrote: > Sorry, this was my first patch to the list. I'll do better :-) > You are right about the "wc -l" parts. Maybe I was a bit over > pessimistic. Throw away my last mail. Done :-) > In my case test 9 ran

Re: deadlock git upload-pack command when GIT_TRACE is enabled

2016-05-09 Thread Stefan Beller
On Mon, May 9, 2016 at 10:53 AM, Stefan Beller wrote: > On Mon, May 9, 2016 at 10:49 AM, Eugene Petrenko > wrote: >> Hello, >> >> I stuck around the deadlock inside git when running git upload-pack . >> command. A debugging shown that the bottom process (it starts several >> processes to implemen

Re: deadlock git upload-pack command when GIT_TRACE is enabled

2016-05-09 Thread Stefan Beller
On Mon, May 9, 2016 at 10:49 AM, Eugene Petrenko wrote: > Hello, > > I stuck around the deadlock inside git when running git upload-pack . > command. A debugging shown that the bottom process (it starts several > processes to implement the task) hangs writing to stderr. I managed to > reproduce th

deadlock git upload-pack command when GIT_TRACE is enabled

2016-05-09 Thread Eugene Petrenko
Hello, I stuck around the deadlock inside git when running git upload-pack . command. A debugging shown that the bottom process (it starts several processes to implement the task) hangs writing to stderr. I managed to reproduce the issue with a tiny bash script. The repository and the script is fo

[PATCH v1 1/1] t5601: Remove trailing space in sed expression

2016-05-09 Thread tboegi
From: Torsten Bögershausen The sed expression for IPv6, "Tested User And Host" or "tuah" used a wrong sed expression, which doesn't work under all versions of sed. Reported-By: Armin Kunaschik Signed-off-by: Torsten Bögershausen --- t/t5601-clone.sh | 2 +- 1 file changed, 1 insertion(+), 1 d

Re: [PATCH v7 1/3] tests: Adjust the configuration for Apache 2.2

2016-05-09 Thread Junio C Hamano
Jeff King writes: > On Mon, May 09, 2016 at 09:42:32AM -0700, Junio C Hamano wrote: > >> > Hopefully your patch to remove the -c ... sanitizing makes it to `master` >> > soon, then I can submit my next iteration. >> >> Or we can just merge that "do not sanitize" branch in, and then >> queue the

Re: [PATCH] t6302: simplify non-gpg cases

2016-05-09 Thread Eric Sunshine
On Mon, May 9, 2016 at 12:49 PM, Jeff King wrote: > On Mon, May 09, 2016 at 12:30:43PM -0400, Eric Sunshine wrote: > Since you as the author of 618310a seem to agree with this direction, > here it is as a real patch. Thanks for working on this. > Subject: [PATCH] t6302: simplify non-gpg cases >

Re: [PATCH 80/83] run-command: make dup_devnull() non static

2016-05-09 Thread Junio C Hamano
Duy Nguyen writes: > I vote one step at a time, leave multi-thread support for future. > There's a lot more shared state than file descriptors anyway, at least > there are object db and index access and probably a couple of hidden > static variables somewhere. And I'm not sure if multi-thread rea

Re: Found possible branch point, then "Use of uninitialized value $u in substitution/concatenation"

2016-05-09 Thread Thierry Suzanne
On 7 May 2016 at 08:07, Christian Couder wrote: > > On Fri, May 6, 2016 at 5:31 PM, Thierry Suzanne > wrote: > > Sorry, can't help :( > > I just sent a patch. It would be nice if you could test it to confirm > that you get a nicer error message. > > Also please reply below other people's comment

Re: Re: [RFD/PATCH] submodule doc: describe where we can configure them

2016-05-09 Thread Stefan Beller
>> Here is what I imagine >> When B mirrors from A, B sets up this special ref for its repository, >> e.g. refs/meta/submodule-B and have a symbolic ref pointing at that. >> (e.g. SUBMODULE_CONFIG pointing at refs/meta/submodule-B, >> which has a worktree which contains a .gitmodules files which >>

Re: [PATCH v2 1/2] mingw: introduce the 'core.hideDotFiles' setting

2016-05-09 Thread Junio C Hamano
Johannes Schindelin writes: > +core.hideDotFiles:: > + (Windows-only) If true, mark newly-created directories and files whose > + name starts with a dot as hidden. If 'dotGitOnly', only the `.git/` > + directory is hidden, but no other files starting with a dot. The > + default

Re: [PATCH] t6041: do not compress backup tar file

2016-05-09 Thread Armin Kunaschik
Hi Stefan, I'm currently in the process of skipping through the failed tests on my AIX box. There are more tests which require GNU tools like mktemp (t7610-mergetool.sh) or readlink (t7800-difftool.sh). But I don't have a solution or workaround for these two. But at least there are not more failin

t5601-clone.sh failures

2016-05-09 Thread Armin Kunaschik
Hi list, eight t5601 tests don't run with my version of sed. The reason is a trailing space in the sed expression. See below: #IPv6 for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]: do ehost=$(echo $tuah | sed -e "s/1]:/1]/ "| tr -d "[]") test_exp

[PATCH] t6041: do not compress backup tar file

2016-05-09 Thread Stefan Beller
The test uses the 'z' option, i.e. "compress the output while at it", which is GNUism and not portable. Reported-by: Armin Kunaschik Signed-off-by: Stefan Beller --- Thanks Armin for reporting these GNUism! Are there any more? (So we can do these patches as a series instead of one by one:)

Re: [PATCH v2 0/2] Support marking .git/ (or all files) as hidden on Windows

2016-05-09 Thread Junio C Hamano
Johannes Schindelin writes: > This is a heavily version of patches we carried in Git for Windows for > way too long without submitting them upstream. > > In this iteration, I also claim authorship for the patch because by now > Kusma's changes were so contorted and mutilated beyond recognition by

Re: [PATCH v7 1/3] tests: Adjust the configuration for Apache 2.2

2016-05-09 Thread Jeff King
On Mon, May 09, 2016 at 09:42:32AM -0700, Junio C Hamano wrote: > > Hopefully your patch to remove the -c ... sanitizing makes it to `master` > > soon, then I can submit my next iteration. > > Or we can just merge that "do not sanitize" branch in, and then > queue the "next iteration" which I'd a

t6041-bisect-submodule.sh tar -z not portable

2016-05-09 Thread Armin Kunaschik
Hi, similar to t3513, in t6041 tar is used with the -z flag which is not portable and should be removed the same way as in t3513. Regards, Armin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://v

[PATCH] t6302: simplify non-gpg cases

2016-05-09 Thread Jeff King
On Mon, May 09, 2016 at 12:30:43PM -0400, Eric Sunshine wrote: > The latter seems very preferable, though perhaps it could be made more > concise like this? > > sign= > test_have_prereq GPG && sign=-s > > (But that's a minor issue.) I agree that is nicer, but I wanted to keep the defini

Re: [PATCH v7 1/3] tests: Adjust the configuration for Apache 2.2

2016-05-09 Thread Junio C Hamano
Johannes Schindelin writes: > Okay, I already force-pushed my extra-http-header branch and the next > iteration will sport this paragraph. The new explanation is well written and can and should also replace the comment before the implementation in the configuration file to help readers. To be h

Re: t4151 missing quotes

2016-05-09 Thread Armin Kunaschik
Sorry, this was my first patch to the list. I'll do better :-) You are right about the "wc -l" parts. Maybe I was a bit over pessimistic. Throw away my last mail. In my case test 9 ran unsuccessful because of an empty "git ls-files -u" This reduces the diff to this one (hopefully the right way now

Re: t6392 broken on pu (Mac OS X)

2016-05-09 Thread Eric Sunshine
On Mon, May 9, 2016 at 12:07 PM, Jeff King wrote: > On Sat, May 07, 2016 at 06:15:19PM +0200, Torsten Bögershausen wrote: >> These tests fail here under Mac OS, >> they pass under Linux: >> commit ff3d9b660a4b6e9d3eeb664ce1febe717adff737 >> I haven't had a chance to dig further. > > I assume you m

Re: t4151 missing quotes

2016-05-09 Thread Eric Sunshine
On Mon, May 9, 2016 at 12:22 PM, Eric Sunshine wrote: > On Mon, May 9, 2016 at 12:09 PM, Armin Kunaschik > wrote: >> *** t4151-am-abort.sh Mon May 9 17:51:44 2016 >> --- t4151-am-abort.sh.orig Fri Apr 29 23:37:00 2016 >> ! test 3 -eq "$(git ls-files -u | wc -l)" && >> ! test 3

Re: [PATCH v7 1/3] tests: Adjust the configuration for Apache 2.2

2016-05-09 Thread Junio C Hamano
Johannes Schindelin writes: > +# Apache 2.2 does not understand , so we use RewriteCond. > +# And as RewriteCond unfortunately lacks "not equal" matching, we use this > +# ugly trick to fail *unless* the two headers are present. > +RewriteCond %{HTTP:x-magic-one} =abra > +RewriteCond %{HTTP:x-mag

Re: t4151 missing quotes

2016-05-09 Thread Eric Sunshine
On Mon, May 9, 2016 at 12:09 PM, Armin Kunaschik wrote: > skipping through some failed tests I found more (smaller) problems > inside the test... when test arguments are empty they need to be > quoted (quite a lot test in this sentence). > > Error is like > t4151-am-abort.sh[5]: test: argument exp

Re: [RFD/PATCH] submodule doc: describe where we can configure them

2016-05-09 Thread Junio C Hamano
Heiko Voigt writes: >> > - When upstream adds a new submodule, I have to do the same manual >> > work to change the options for that new submodule. >> >> Because a new module is not automatically "init"ed by default? >> >> Isn't "config only" vs "config with gitmodules fallback" orthogonal >>

Re: t6044 broken on pu

2016-05-09 Thread Jeff King
On Mon, May 09, 2016 at 12:02:45PM -0400, Eric Sunshine wrote: > > I had that thought, too, but I think it would be an error to do so. > > test_seq is supposed to be a replacement for "seq", which does not > > understand non-numeric sequences. > > Although, the comment block just above test_seq()

t4151 missing quotes

2016-05-09 Thread Armin Kunaschik
Hi there, skipping through some failed tests I found more (smaller) problems inside the test... when test arguments are empty they need to be quoted (quite a lot test in this sentence). Error is like t4151-am-abort.sh[5]: test: argument expected My patch: *** t4151-am-abort.sh Mon May 9 17:5

Re: t6392 broken on pu (Mac OS X)

2016-05-09 Thread Jeff King
On Sat, May 07, 2016 at 06:15:19PM +0200, Torsten Bögershausen wrote: > These tests fail here under Mac OS, > they pass under Linux: > commit ff3d9b660a4b6e9d3eeb664ce1febe717adff737 > I haven't had a chance to dig further. I assume you mean t6302. It looks like the difference is not Mac OS, but

Re: [PATCH] Move test-* to t/helper/ subdirectory

2016-05-09 Thread Junio C Hamano
Duy Nguyen writes: > So among the options we have so far, which way should we go, or leave it as > is? Thanks for reminding me. I like that version you sent with "I may have rushed to judgment" comment the most. Perhaps I can just queue it with s/PATH/PROG/ fixup? > > On Tue, May 3, 2016 at

  1   2   >