[ANNOUNCE] Git v2.15.0-rc2

2017-10-19 Thread Junio C Hamano
A release candidate Git v2.15.0-rc2 is now available for testing at the usual places. It is comprised of 737 non-merge commits since v2.14.0, contributed by 75 people, 22 of which are new faces. We had to back-track a bit wrt to the "git add -p" regression; for now, we simply revert the changes t

Hi Dear,

2017-10-19 Thread Lisa Williams
Hi Dear, how are you today I hope that everything is OK with you as it is my great pleasure to contact you in having communication with you starting from today, i was just going through the Internet search when i found your email address, I want to make a very new and special friend, so i dec

Re: [PATCH] builtin/push.c: add push.pushOption config

2017-10-19 Thread Junio C Hamano
Junio C Hamano writes: > Junio C Hamano writes: > >>> We'd also want to document how push.pushOption works in >>> Documentation/config.txt (that contains all the configs) >> >> Perhaps. > > Here is my attempt. Another thing I noticed while we are around the area is that unlike all other options

Re: [PATCH] builtin/push.c: add push.pushOption config

2017-10-19 Thread Junio C Hamano
Junio C Hamano writes: >> We'd also want to document how push.pushOption works in >> Documentation/config.txt (that contains all the configs) > > Perhaps. Here is my attempt. I have a feeling that the way http.extraheaders is described may be much easier to read and we may want to mimick its st

Re: "Cannot fetch git.git" (worktrees at fault? or origin/HEAD) ?

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 10:27:28PM -0700, Stefan Beller wrote: > > If my analysis above is correct, then it's already fixed. You just had > > leftover corruption. > > Well fetching yesterday worked and the commit in question is from > 8/23, the merge 8a044c7f1d56cef657be342e40de0795d688e882 > oc

Re: [PATCH 2/3] t5615: avoid re-using descriptor 4

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 07:23:37PM -0400, Jeff King wrote: > So one trick is that we can't just set it to a higher number. We have to > also open and manage that descriptor. It might be enough to do: > > if test -n "$BASH_VERSION" > then > exec 999>&4 > BASH_XTRACEFD=999 > fi >

Re: [Alt. PATCH] ls-remote: deprecate -h as short for --heads

2017-10-19 Thread Junio C Hamano
Jeff King writes: > It seems weird and inconsistent to me that the meaning of "-h" > depends on the position and presence of other unrelated options. Maybe > it's just me. I know _why_ it's that way, but this seems like one of > those weird corners of the interface that end up confusing people a

Re: "Cannot fetch git.git" (worktrees at fault? or origin/HEAD) ?

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 8:16 PM, Jeff King wrote: > On Thu, Oct 19, 2017 at 06:43:57PM -0700, Stefan Beller wrote: > > So that's the right immediate workaround (and hoping there was nothing > valuable in that worktree!). How would I know? ;) Without the commit available I do not even know if th

Re: "Cannot fetch git.git" (worktrees at fault? or origin/HEAD) ?

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 06:43:57PM -0700, Stefan Beller wrote: > So I ran "git fetch --all" inside git.git that you are all familiar with. > All fetches failed with a similar error as: > Fetching kernelorg > fatal: bad object HEAD > error: https://kernel.googlesource.com/pub/scm/git/git did not se

Re: [Alt. PATCH] ls-remote: deprecate -h as short for --heads

2017-10-19 Thread Jeff King
On Fri, Oct 20, 2017 at 10:04:23AM +0900, Junio C Hamano wrote: > > Yuck. This "we only treat -h as special in certain cases" rule is > > sufficiently magical that I don't think we want to advertise and lock > > ourselves into it. > > Hmph. I think it is way too late to be worried about "locked

Re: [PATCH] builtin/push.c: add push.pushOption config

2017-10-19 Thread Junio C Hamano
Stefan Beller writes: >> @@ -161,6 +161,9 @@ already exists on the remote side. >> Transmit the given string to the server, which passes them to >> the pre-receive as well as the post-receive hook. The given string >> must not contain a NUL or LF character. >> + When

"Cannot fetch git.git" (worktrees at fault? or origin/HEAD) ?

2017-10-19 Thread Stefan Beller
So I ran "git fetch --all" inside git.git that you are all familiar with. All fetches failed with a similar error as: Fetching kernelorg fatal: bad object HEAD error: https://kernel.googlesource.com/pub/scm/git/git did not send all necessary objects error: Could not fetch kernelorg Working with a

Do you need financial help?

2017-10-19 Thread Mr . Robert
Do you need a loan to enhance your business?, Loan to consolidate your debt,Loan for personal use, Loan for credit Card, Medical Care loan,Car Loan,Mortgage Loan, Student Loan, loan for any purposes? e.t.c.Get loan at 1% interest rate annually, Hurry up now and fill out this below application d

Re: [PATCH v1] read_index_from(): Skip verification of the cache entry order to speed index loading

2017-10-19 Thread Junio C Hamano
Jeff King writes: > It should be easy enough to check that; the patch below implements it. > I couldn't measure any speedup with it running "git ls-files >/dev/null" > on linux.git (60k files). But nor could I get any by dropping the check > entirely. I would expect that the speedup (due to poss

[PATCH 4/4] fsmonitor: Delay updating state until after split index is merged

2017-10-19 Thread Alex Vandiver
If the fsmonitor extension is used in conjunction with the split index extension, the set of entries in the index when it is first loaded is only a subset of the real index. This leads to only the non-"base" index being marked as CE_FSMONITOR_VALID. Delay the expansion of the ewah bitmap until af

[PATCH 1/4] fsmonitor: Watch, and ask about, the top of the repo, not the CWD

2017-10-19 Thread Alex Vandiver
Signed-off-by: Alex Vandiver --- t/t7519/fsmonitor-watchman | 3 ++- templates/hooks--fsmonitor-watchman.sample | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t7519/fsmonitor-watchman b/t/t7519/fsmonitor-watchman index a3e30bf54..377edc7be 100755 --- a/t

[PATCH 0/4] fsmonitor fixes

2017-10-19 Thread Alex Vandiver
A few fixes found from playing around with the fsmonitor branch in next. - Alex

[PATCH 3/4] fsmonitor: Document GIT_TRACE_FSMONITOR

2017-10-19 Thread Alex Vandiver
Signed-off-by: Alex Vandiver --- Documentation/git.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/git.txt b/Documentation/git.txt index 1fca63634..720db196e 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -594,6 +594,10 @@ into it. Unsetting the varia

[PATCH 2/4] fsmonitor: Don't bother pretty-printing JSON from watchman

2017-10-19 Thread Alex Vandiver
This provides small performance savings. Signed-off-by: Alex Vandiver --- t/t7519/fsmonitor-watchman | 2 +- templates/hooks--fsmonitor-watchman.sample | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7519/fsmonitor-watchman b/t/t7519/fsmonitor-watchman i

Re: [Alt. PATCH] ls-remote: deprecate -h as short for --heads

2017-10-19 Thread Junio C Hamano
Jeff King writes: > On Thu, Oct 19, 2017 at 08:26:47PM +0200, René Scharfe wrote: > >> diff --git a/Documentation/git-ls-remote.txt >> b/Documentation/git-ls-remote.txt >> index 5f2628c8f8..82622e7fbc 100644 >> --- a/Documentation/git-ls-remote.txt >> +++ b/Documentation/git-ls-remote.txt >> @@

Re: [PATCH v4 2/3] implement fetching of moved submodules

2017-10-19 Thread Stefan Beller
On Wed, Oct 18, 2017 at 5:35 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> but if we already have a submodule with that name (the most likely >>> explanation for its existence is because it started its life there >>> and then later moved), and the submodule is bound to a different >>> p

Re: [PATCH 2/3] t5615: avoid re-using descriptor 4

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 02:46:33PM -0700, Stefan Beller wrote: > > I also considered trying to bump the "set -x" output descriptor to "9". > > That just moves the problem around, but presumably scripts are less > > likely to go that high. :) > > > > It would also be possible to pick something insa

Re: Minor man page weirdness?

2017-10-19 Thread Lars Schneider
> On 18 Oct 2017, at 05:21, Jeff King wrote: > > On Wed, Oct 18, 2017 at 11:34:31AM +0900, Junio C Hamano wrote: > >> -- >8 -- >> branch doc: sprinkle a few commas for readability >> >> The "--force" option can also be used when the named branch does not >> yet exist, and the point of the opti

Re: [PATCH v1] read_index_from(): Skip verification of the cache entry order to speed index loading

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 8:12 AM, Ben Peart wrote: > If we are guarding against "git" writing out an invalid index, we can move > this into an assert so that only git developers pay the cost of validating > they haven't created a new bug. I think this is better than just adding a > new test case

Re: [PATCH 6/6] Add Git/Packet.pm from parts of t0021/rot13-filter.pl

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 5:30 AM, Christian Couder wrote: > And while at it let's simplify t0021/rot13-filter.pl by > using Git/Packet.pm. > > This will make it possible to reuse packet related > functions in other test scripts. > > Signed-off-by: Christian Couder > --- > perl/Git/Packet.pm

Re: [PATCH 1/6] t0021/rot13-filter: refactor packet reading functions

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 5:30 AM, Christian Couder wrote: > To make it possible in a following commit to move packet > reading and writing functions into a Packet.pm module, > let's refactor these functions, so they don't handle > printing debug output and exiting. > > Signed-off-by: Christian Coud

Re: [PATCH 5/5] diff: handle NULs in get_string_hash()

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 2:39 PM, Jeff King wrote: > On Thu, Oct 19, 2017 at 02:31:20PM -0700, Stefan Beller wrote: > >> > This is unlikely to ever come up in practice since our line >> > boundaries generally come from calling strlen() in the first >> > place. >> >> get_string_hash is called from >

Re: [PATCH 2/3] t5615: avoid re-using descriptor 4

2017-10-19 Thread Stefan Beller
> I also considered trying to bump the "set -x" output descriptor to "9". > That just moves the problem around, but presumably scripts are less > likely to go that high. :) > > It would also be possible to pick something insanely high, like "999". > Many shells choke on descriptors higher than 9, b

Re: [PATCH 5/5] diff: handle NULs in get_string_hash()

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 02:31:20PM -0700, Stefan Beller wrote: > > This is unlikely to ever come up in practice since our line > > boundaries generally come from calling strlen() in the first > > place. > > get_string_hash is called from > prepare_entry, which in turn is called from > add_line

Re: [PATCH 5/5] diff: handle NULs in get_string_hash()

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 1:31 PM, Jeff King wrote: > For computing moved lines, we feed the characters of each > line into a hash. When we've been asked to ignore > whitespace, then we pick each character using next_byte(), > which returns -1 on end-of-string, which it determines using > the start/

Re: [PATCH 4/5] diff: fix whitespace-skipping with --color-moved

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 02:15:12PM -0700, Stefan Beller wrote: > > +test_expect_failure 'move detection ignoring whitespace at eol' ' > > + git reset --hard && > > + # Lines 6-9 have new eol whitespace, but 9 also has it in the middle > > + q_to_tab <<-\EOF >lines.txt && > > +

I NEED YOUR URGENT HELP AND CORPERATION

2017-10-19 Thread IBRAHIM KABORE
Dear Friend I am contacting you on a business deal of $9,500,000.00 Million United States Dollars, ready for transfer into your own personal account and if we make this claim, we will share it on the ratio of 50% / 50% basis, I would like to assure you that it be 100% risk free and it will be l

Re: [PATCH 4/5] diff: fix whitespace-skipping with --color-moved

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 1:29 PM, Jeff King wrote: > The code for handling whitespace with --color-moved > represents partial strings as a pair of pointers. There are > two possible conventions for the end pointer: > > 1. It points to the byte right after the end of the > string. > > 2. It

Re: [PATCH 3/5] t4015: test the output of "diff --color-moved -b"

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 02:03:54PM -0700, Stefan Beller wrote: > > + > > + git diff HEAD --no-renames --color-moved --color | > > + grep -v "index" | > > + test_decode_color >actual && > > The -v index grep makes it future proof (for a new hash)! > I like that. W

Re: [PATCH 1/5] t4015: refactor --color-moved whitespace test

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 01:56:55PM -0700, Stefan Beller wrote: > On Thu, Oct 19, 2017 at 1:24 PM, Jeff King wrote: > > > > > +test_expect_success 'clean up whitespace-test colors' ' > > + git config --unset color.diff.oldMoved && > > + git config --unset color.diff.newMoved > > +' >

[PATCH 3/3] test-lib: make "-x" work with "--verbose-log"

2017-10-19 Thread Jeff King
The "-x" tracing option implies "--verbose". This is a problem when running under a TAP harness like "prove", where we need to use "--verbose-log" instead. Instead, let's handle this the same way we do for --valgrind, including the recent fix from 88c6e9d31c (test-lib: --valgrind should not overrid

[PATCH 2/3] t5615: avoid re-using descriptor 4

2017-10-19 Thread Jeff King
File descriptors 3 and 4 are special in our test suite, as they link back to the test script's original stdout and stderr. Normally this isn't something tests need to worry about: they are free to clobber these descriptors for sub-commands without affecting the overall script. But there's one very

Re: [PATCH 3/5] t4015: test the output of "diff --color-moved -b"

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 1:26 PM, Jeff King wrote: > Commit fa5ba2c1dd (diff: fix infinite loop with > --color-moved --ignore-space-change, 2017-10-12) added a > test to make sure that "--color-moved -b" doesn't run > forever, but the test in question doesn't actually have any > moved lines in it.

[PATCH 1/3] test-lib: silence "-x" cleanup under bash

2017-10-19 Thread Jeff King
When the test suite's "-x" option is used with bash, we end up seeing cleanup cruft in the output: $ bash t0001-init.sh -x [...] ++ diff -u expected actual + test_eval_ret_=0 + want_trace + test t = t + test t = t + set +x ok 42 - re-init from a linked worktree This ranges from

[PATCH 0/3] making test-suite tracing more useful

2017-10-19 Thread Jeff King
I sometimes run git's test suite as part of an automated testing process. I was hoping to add "-x" support to get more details when a test fails (since failures are sometimes hard to reproduce). But I hit a few small snags: - you have to run with bash, since BASH_XTRACEFD is required to avoid

Re: [PATCH 1/5] t4015: refactor --color-moved whitespace test

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 1:24 PM, Jeff King wrote: > > +test_expect_success 'clean up whitespace-test colors' ' > + git config --unset color.diff.oldMoved && > + git config --unset color.diff.newMoved > +' This could be part of the previous test as test_config color.diff.oldMoved "

Re: [PATCH 2/5] t4015: check "negative" case for "-w --color-moved"

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 1:25 PM, Jeff King wrote: > We test that lines with whitespace changes are not found by > "--color-moved" by default, but are found if "-w" is added. > Let's add one more twist: a line that has non-whitespace > changes should not be marked as a pure move. > > This is perhap

Re: [Alt. PATCH] ls-remote: deprecate -h as short for --heads

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 08:26:47PM +0200, René Scharfe wrote: > diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt > index 5f2628c8f8..82622e7fbc 100644 > --- a/Documentation/git-ls-remote.txt > +++ b/Documentation/git-ls-remote.txt > @@ -29,6 +29,9 @@ OPTIONS > T

[PATCH 5/5] diff: handle NULs in get_string_hash()

2017-10-19 Thread Jeff King
For computing moved lines, we feed the characters of each line into a hash. When we've been asked to ignore whitespace, then we pick each character using next_byte(), which returns -1 on end-of-string, which it determines using the start/end pointers we feed it. However our check of its return val

[PATCH 4/5] diff: fix whitespace-skipping with --color-moved

2017-10-19 Thread Jeff King
The code for handling whitespace with --color-moved represents partial strings as a pair of pointers. There are two possible conventions for the end pointer: 1. It points to the byte right after the end of the string. 2. It points to the final byte of the string. But we seem to use both

[PATCH 3/5] t4015: test the output of "diff --color-moved -b"

2017-10-19 Thread Jeff King
Commit fa5ba2c1dd (diff: fix infinite loop with --color-moved --ignore-space-change, 2017-10-12) added a test to make sure that "--color-moved -b" doesn't run forever, but the test in question doesn't actually have any moved lines in it. Let's scrap that test and add a variant of the existing "--c

[PATCH 2/5] t4015: check "negative" case for "-w --color-moved"

2017-10-19 Thread Jeff King
We test that lines with whitespace changes are not found by "--color-moved" by default, but are found if "-w" is added. Let's add one more twist: a line that has non-whitespace changes should not be marked as a pure move. This is perhaps an obvious case for us to get right (and we do), but as we a

[PATCH 1/5] t4015: refactor --color-moved whitespace test

2017-10-19 Thread Jeff King
In preparation for testing several different whitespace options, let's split out the setup and cleanup steps of the whitespace test. While we're here, let's also switch to using "<<-" to indent our here-documents properly, and use q_to_tab to more explicitly mark where we expect whitespace to appe

[PATCH 0/5] fix "diff --color-moved --ignore-space-at-eol"

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 01:42:46AM -0400, Jeff King wrote: > It's late here, so I'll wait for comments from Stefan and then try to > wrap it up with a commit message and test tomorrow. Here it is. The fix is in patch 4. The earlier ones are just beefing up the test coverage, and the last one is

Re: [PATCH] diff.c: increment buffer pointer in all code path

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 12:53:03PM -0700, Stefan Beller wrote: > > @@ -771,7 +771,7 @@ static unsigned get_string_hash(struct > > emitted_diff_symbol *es, struct diff_opti > > { > > if (o->xdl_opts & XDF_WHITESPACE_FLAGS) { > > static struct strbuf sb = STRBUF_INIT; > > -

Re: [PATCH] diff.c: increment buffer pointer in all code path

2017-10-19 Thread Stefan Beller
On Wed, Oct 18, 2017 at 10:42 PM, Jeff King wrote: > > So I think the right fix is this: > [...] > > It's late here, so I'll wait for comments from Stefan and then try to > wrap it up with a commit message and test tomorrow. > > -Peff I agree that this is better and looks correct. Thanks for off

[PATCH] add a test for "describe --contains" with mixed tags

2017-10-19 Thread orgads
From: Orgad Shaneh --- t/t6120-describe.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 1c0e865..08427f4 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -340,4 +340,20 @@ test_expect_success ULIMIT_STACK_SIZE

Re: [PATCH] diff.c: increment buffer pointer in all code path

2017-10-19 Thread Stefan Beller
On Wed, Oct 18, 2017 at 10:24 PM, Jeff King wrote: > On Thu, Oct 19, 2017 at 01:04:59AM -0400, Jeff King wrote: > >> So. That leaves me with: >> >> - I'm unclear on whether next_byte() is meant to return that trailing >> NUL or not. I don't think it causes any bugs, but it certainly >> c

Re: [PATCH/RFC] grep: turn off threading when recursing submodules

2017-10-19 Thread Martin Ågren
On 19 October 2017 at 21:34, Jeff King wrote: > On Thu, Oct 19, 2017 at 12:26:18PM -0700, Brandon Williams wrote: > >> One alternative to turning off threading would be to employ proper >> locking (like I failed to do) by wrapping the call the >> 'add_to_alternates_memory()' in calls to grep_read_

Re: [PATCH] builtin/push.c: add push.pushOption config

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 10:47 AM, Marius Paliga wrote: > Push options need to be given explicitly, via the command line as "git > push --push-option ". Add the config option push.pushOption, > which is a multi-valued option, containing push options that are sent > by default. > > When push option

Re: [PATCH/RFC] grep: turn off threading when recursing submodules

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 12:26:18PM -0700, Brandon Williams wrote: > One alternative to turning off threading would be to employ proper > locking (like I failed to do) by wrapping the call the > 'add_to_alternates_memory()' in calls to grep_read_lock/unlock: > > + grep_read_lock(); >

Re: [PATCH v3 4/4] status: test --ignored=matching

2017-10-19 Thread Stefan Beller
On Thu, Oct 19, 2017 at 9:06 AM, Jameson Miller wrote: > +test_expect_success 'Verify behavior of status on folders with ignored > files' ' https://stackoverflow.com/questions/5078676/what-is-the-difference-between-a-directory-and-a-folder We test directories here? All tests are testing --igno

Re: [PATCH/RFC] grep: turn off threading when recursing submodules

2017-10-19 Thread Brandon Williams
On 10/19, Martin Ågren wrote: > With --recurse-submodules, we use the machinery for alternate object > databases and pretend that the repository is an alternate ODB. This has > some drawbacks since the list of alternates is global and will grow as > we proceed. Still, that's a problem with performa

Re: [PATCH v4 3/3] submodule: simplify decision tree whether to or not to fetch

2017-10-19 Thread Brandon Williams
On 10/19, Heiko Voigt wrote: > On Thu, Oct 19, 2017 at 09:36:47AM +0900, Junio C Hamano wrote: > > Brandon Williams writes: > > > > > On 10/16, Heiko Voigt wrote: > > >> To make extending this logic later easier. > > > > > > This makes things so much clearer, thanks! > > > > I agree that it is c

[PATCH/RFC] grep: turn off threading when recursing submodules

2017-10-19 Thread Martin Ågren
With --recurse-submodules, we use the machinery for alternate object databases and pretend that the repository is an alternate ODB. This has some drawbacks since the list of alternates is global and will grow as we proceed. Still, that's a problem with performance, not correctness. The other immedi

This is Mr.Frankly Ejero. am writing to inform you that am back from holidays,

2017-10-19 Thread Mr.Frankly Ejero
Good Day This is Mr.Frankly Ejero. am writing to inform you that am back from holidays, and regarding the last meeting it came out good, so the bank is read to transfer the fund into your account.I am only waiting for your directions(ejerofrankly...@gmail.com) Best Regard Mr.Frankly Ejero

[PATCH v2 2/2] mark git stash push deprecated in the man page

2017-10-19 Thread Thomas Gummerer
'git stash push' fixes a historical wart in the interface of 'git stash save'. As 'git stash push' has all functionality of 'git stash save', with a nicer, more consistent user interface deprecate 'git stash save'. To do this, remove it from the synopsis of the man page, and move it to a separate

[PATCH v2 1/2] replace git stash save with git stash push in the documentation

2017-10-19 Thread Thomas Gummerer
git stash push is the newer interface for creating a stash. While we are still keeping git stash save around for the time being, it's better to point new users of git stash to the more modern (and more feature rich) interface, instead of teaching them the older version that we might want to phase

Re: [Alt. PATCH] ls-remote: deprecate -h as short for --heads

2017-10-19 Thread René Scharfe
Am 18.10.2017 um 01:22 schrieb Junio C Hamano: > René Scharfe writes: > >> Stop advertising -h as the short equivalent of --heads, because it's >> used for showing a short help text for almost all other git commands. >> Since the ba5f28bf79 (ls-remote: use parse-options api) it has only >> been w

[PATCH 2/2] fetch, push: keep separate lists of submodules and gitlinks

2017-10-19 Thread Stefan Beller
Currently when fetching we collect the names of submodules to be fetched in a list. As we also want to support fetching 'gitlinks, that happen to have a repo checked out at the right place', we'll just pretend that these are submodules. We do that by assuming their path is their name. This in turn

[PATCH 1/2] t5526: check for name/path collision in submodule fetch

2017-10-19 Thread Stefan Beller
Signed-off-by: Stefan Beller --- This is just to test the corner case we're discussing. Applies on top of origin/hv/fetch-moved-submodules-on-demand. t/t5526-fetch-submodules.sh | 42 ++ 1 file changed, 42 insertions(+) diff --git a/t/t5526-fetch-submod

Re: [PATCH 2/1] mention git stash push first in the man page

2017-10-19 Thread Thomas Gummerer
On 10/17, Jeff King wrote: > On Tue, Oct 17, 2017 at 10:45:15PM +0100, Thomas Gummerer wrote: > > > > Seems reasonable, though if we are deprecating "save" should we demote > > > it from being in the synopsis entirely? > > > > I saw that as a next step, with the "official" deprecation of "save".

Re: [PATCH 2/4] remote: handle broken symrefs

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 01:47:30PM -0400, Jeff King wrote: > This is hard to trigger in practice, since this function is > used as a callback to for_each_ref(), which will skip broken > refs in the first place (so it would have to be broken > racily, or for us to see a transient filesystem error).

[PATCH 4/4] worktree: handle broken symrefs in find_shared_symref()

2017-10-19 Thread Jeff King
The refs_resolve_ref_unsafe() function may return NULL even with a REF_ISSYMREF flag if a symref points to a broken ref. As a result, it's possible for find_shared_symref() to segfault when it passes NULL to strcmp(). This is hard to trigger for most code paths. We typically pass HEAD to the funct

[PATCH] builtin/push.c: add push.pushOption config

2017-10-19 Thread Marius Paliga
Push options need to be given explicitly, via the command line as "git push --push-option ". Add the config option push.pushOption, which is a multi-valued option, containing push options that are sent by default. When push options are set in the lower-priority configulation file (e.g. /etc/gitco

[PATCH 3/4] log: handle broken HEAD in decoration check

2017-10-19 Thread Jeff King
The resolve_ref_unsafe() function may return NULL even with a REF_ISSYMREF flag if a symref points to a broken ref. As a result, it's possible for the decoration code's "is this branch the current HEAD" check to segfault when it passes the NULL to starts_with(). This is unlikely in practice, since

[PATCH 2/4] remote: handle broken symrefs

2017-10-19 Thread Jeff King
It's possible for resolve_ref_unsafe() to return NULL with a REF_ISSYMREF flag if a symref points to a broken ref. In this case, the read_remote_branches() function will segfault passing the name to xstrdup(). This is hard to trigger in practice, since this function is used as a callback to for_e

[PATCH 1/4] test-ref-store: avoid passing NULL to printf

2017-10-19 Thread Jeff King
It's possible for resolve_ref_unsafe() to return NULL (e.g., if we are reading and the ref does not exist), in which case we'll pass NULL to printf. On glibc systems this produces "(null)", but on others it may segfault. The tests don't expect any such case, but if we ever did trigger this, we wou

Re: [PATCH v2] commit: check result of resolve_ref_unsafe

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 12:36:50PM +0300, Andrey Okoshkin wrote: > Add check of the resolved HEAD reference while printing of a commit summary. > resolve_ref_unsafe() may return NULL pointer if underlying calls of lstat() > or > open() fail in files_read_raw_ref(). > Such situation can be caused b

1 Unread Message

2017-10-19 Thread Mr James Amin
Good day, I am Mr James Amin, I am Requesting for your partnership in re-profiling funds, Contact me for more details. Thanks, Mr James Amin

Re: [PATCH] use filetest pragma to work with ACL

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 09:53:28AM +0200, Guillaume Castagnino wrote: > > This "use" will unconditionally at compile-time (such as "compile" is > > for perl, anyway). Which raises a few questions: > > > > - would we want to use "require" instead to avoid loading when we > > don't enter this

[PATCH v3 4/4] status: test --ignored=matching

2017-10-19 Thread Jameson Miller
Add tests around status reporting ignord files that match an exclude pattern for both --untracked-files=normal and --untracked-files=all. Signed-off-by: Jameson Miller --- t/t7519-ignored-mode.sh | 183 1 file changed, 183 insertions(+) create mo

[PATCH v3 2/4] status: report matching ignored and normal untracked

2017-10-19 Thread Jameson Miller
Teach status command to handle `--ignored=matching` with `--untracked-files=normal` Signed-off-by: Jameson Miller --- dir.c | 20 ++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dir.c b/dir.c index b9af87eca9..20457724c0 100644 --- a/dir.c +++ b/dir.c @@ -1585

[PATCH v3 3/4] status: document options to show matching ignored files

2017-10-19 Thread Jameson Miller
Signed-off-by: Jameson Miller --- Documentation/git-status.txt | 21 +- Documentation/technical/api-directory-listing.txt | 27 +++ 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/Documentation/git-status.txt b/Documentation

[PATCH v3 1/4] status: add option to show ignored files differently

2017-10-19 Thread Jameson Miller
Teach the status command more flexibility in how ignored files are reported. Currently, the reporting of ignored files and untracked files are linked. You cannot control how ignored files are reported independently of how untracked files are reported (i.e. `all` vs `normal`). This makes it impossib

[PATCH v3 0/4] status: add option to show ignored files differently

2017-10-19 Thread Jameson Miller
The previous iteration can be found here: https://public-inbox.org/git/20171011133504.15049-1-jam...@microsoft.com/ The main difference is to address feedback around commit organization and wording. Jameson Miller (4): status: add option to show ignored files differently status: report match

Re: [PATCH v1] read_index_from(): Skip verification of the cache entry order to speed index loading

2017-10-19 Thread Jeff King
On Thu, Oct 19, 2017 at 11:12:03AM -0400, Ben Peart wrote: > > So, I think I like the direction of getting rid of the order > > validation in post_read_index_from(), not only during the normal > > operation but also in fsck. I think it makes more sense to do so > > incrementally inside do_read_in

Re: [PATCH v4 3/3] submodule: simplify decision tree whether to or not to fetch

2017-10-19 Thread Heiko Voigt
On Thu, Oct 19, 2017 at 09:36:47AM +0900, Junio C Hamano wrote: > Brandon Williams writes: > > > On 10/16, Heiko Voigt wrote: > >> To make extending this logic later easier. > > > > This makes things so much clearer, thanks! > > I agree that it is clear to see what the code after the patch does,

Re: [PATCH v1] read_index_from(): Skip verification of the cache entry order to speed index loading

2017-10-19 Thread Ben Peart
On 10/19/2017 1:22 AM, Junio C Hamano wrote: Ben Peart writes: There is code in post_read_index_from() to catch out of order entries when reading an index file. This order verification is ~13% of the cost of every call to read_index_from(). I find this a bit over-generalized claim---would

[PATCH 1/6] t0021/rot13-filter: refactor packet reading functions

2017-10-19 Thread Christian Couder
To make it possible in a following commit to move packet reading and writing functions into a Packet.pm module, let's refactor these functions, so they don't handle printing debug output and exiting. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 12 1 file changed, 8

[PATCH 0/6] Create Git/Packet.pm

2017-10-19 Thread Christian Couder
Goal Packet related functions in Perl can be useful to write new filters or to debug or test existing filters. So instead of having them in t0021/rot13-filter.pl, let's extract them into a new Git/Packet.pm module. Links ~ This patch series has been extracted from previous "Add initial

[PATCH 4/6] t0021/rot13-filter: add packet_initialize()

2017-10-19 Thread Christian Couder
Let's refactor the code to initialize communication into its own packet_initialize() function, so that we can reuse this functionality in following patches. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 20 +--- 1 file changed, 13 insertions(+), 7 deletions(-) di

[PATCH 6/6] Add Git/Packet.pm from parts of t0021/rot13-filter.pl

2017-10-19 Thread Christian Couder
And while at it let's simplify t0021/rot13-filter.pl by using Git/Packet.pm. This will make it possible to reuse packet related functions in other test scripts. Signed-off-by: Christian Couder --- perl/Git/Packet.pm | 118 t/t0021/rot13-filt

[PATCH 2/6] t0021/rot13-filter: improve 'if .. elsif .. else' style

2017-10-19 Thread Christian Couder
Before further refactoring the "t0021/rot13-filter.pl" script, let's modernize the style of its 'if .. elsif .. else' clauses to improve its readability by making it more similar to our other perl scripts. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 39 +

[PATCH 3/6] t0021/rot13-filter: improve error message

2017-10-19 Thread Christian Couder
If there is no new line at the end of something it receives, the packet_txt_read() function die()s, but it's difficult to debug without much context. Let's give a bit more information when that happens. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 3 ++- 1 file changed, 2 inser

[PATCH 5/6] t0021/rot13-filter: add capability functions

2017-10-19 Thread Christian Couder
Add functions to help read and write capabilities. These functions will be reused in following patches. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 40 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/t/t0021/rot13-filter.p

Re:

2017-10-19 Thread Amos Kalonzo
Attn: I am wondering If You receive my email for some days now. reference to the transfer of my client's contract balance payment of (11.7M) Kindly get back to me for more details. Best Regards Amos Kalonzo

[PATCH v2] commit: check result of resolve_ref_unsafe

2017-10-19 Thread Andrey Okoshkin
Add check of the resolved HEAD reference while printing of a commit summary. resolve_ref_unsafe() may return NULL pointer if underlying calls of lstat() or open() fail in files_read_raw_ref(). Such situation can be caused by race: file becomes inaccessible to this moment. Signed-off-by: Andre

Re: [PATCH] commit: check result of resolve_ref_unsafe

2017-10-19 Thread Andrey Okoshkin
I also think it's a good idea to record the destination of the updated symref. But for now the most simple solution is just to catch the unreadable HEAD error. Maybe for the future improvement it would be nice to redesign print_summary passing some ref_transaction results to it. 19.10.2017 05:49,

Re: [PATCH] use filetest pragma to work with ACL

2017-10-19 Thread Guillaume Castagnino
Hi, Le mercredi 18 octobre 2017 à 17:24 -0400, Jeff King a écrit : > On Wed, Oct 18, 2017 at 07:55:31PM +, Guillaume Castagnino wrote: > > > From: Guillaume Castagnino > > [...] > > Stefan raised a few meta issues, all of which I agree with. But I had > some questions about the patch itself