Re: [PATCH/RFC] Cleanup Documentation

2017-06-18 Thread Stefan Beller
On Sun, Jun 18, 2017 at 10:24 PM, Junio C Hamano wrote: > Stefan, this was sent in my way, but I know you are the primary > person who is looking into updating submodule documentation these > days, so I am forwarding it in your way to ask you to give the first > comment. > > Thanks. AFAICT this i

Re: [PATCH/RFC] Cleanup Documentation

2017-06-18 Thread Junio C Hamano
Stefan, this was sent in my way, but I know you are the primary person who is looking into updating submodule documentation these days, so I am forwarding it in your way to ask you to give the first comment. Thanks. Kaartic Sivaraam writes: > 1. Remove redundancy from documentation > 2. Remov

Re: [PATCH v2 0/3] add stash count information to git-status command

2017-06-18 Thread Junio C Hamano
Thanks; queued.

Re: [BUG] add_again() off-by-one error in custom format

2017-06-18 Thread Junio C Hamano
Jeff King writes: > On Sun, Jun 18, 2017 at 12:58:49PM +0200, René Scharfe wrote: > >> Anyway, here's a patch for stat-based invalidation, on top of the other >> one. Array removal is really slow (hope I didn't sneak a bug in there, >> but my confidence in this code isn't very high). No locking

Re: [PATCH 2/2] Add test for the new status message

2017-06-18 Thread Junio C Hamano
Kaartic Sivaraam writes: > +test_expect_success 'No commits yet should be noted in status output' ' > + git init initial && > + cd initial && > + git status >output && > + test_i18ngrep "No commits yet" output && > + test_commit initial && > + git status >outpu

Re: [PATCH 1/2] Contextually notify user about an initial commit

2017-06-18 Thread Junio C Hamano
Kaartic Sivaraam writes: > A few alternatives considered were, > > * Waiting for initial commit > * Your current branch does not have any commits > * Current branch waiting for initial commit > ... "Decided to take the most succinct one." or something to conclude what happend to these alternativ

Re: [PATCH v2 3/4] sha1_file: consolidate storage-agnostic object fns

2017-06-18 Thread Junio C Hamano
Jeff King writes: > I actually think all of that infrastructure could become part of > Jonathan's consolidated lookup, too. We would just need: > > 1. A QUICK flag to avoid re-reading objects/pack when we don't find > anything (which it looks like he already has). > > 2. A FRESHEN flag t

[PATCH/RFC] Cleanup Documentation

2017-06-18 Thread Kaartic Sivaraam
1. Remove redundancy from documentation 2. Remove unclear reference to alternative Signed-off-by: Kaartic Sivaraam --- The following line seemes unclear and hence was removed for now. Suggest any changes that could make it clear. "This second form is provided to ease creating a new submodule fr

Re: [PATCH v3] mergetools/meld: improve compatibiilty with Meld on macOS X

2017-06-18 Thread Samuel Lijin
On Sun, Jun 18, 2017 at 10:10 PM, David Aguilar wrote: > The macOS X fork of Meld[1] requires a "=" in the "--output" > argument, as it uses a wrapper[2] script that munges the > "--output" argument before calling into the common "meld" > script. > > The macOS X wrapper script[2] accepts "--output

[PATCH 2/2] Add test for the new status message

2017-06-18 Thread Kaartic Sivaraam
Patch-by: Ævar Arnfjörð Bjarmason Signed-off-by: Kaartic Sivaraam --- Resending as a continuation of previous patch t/t7508-status.sh | 11 +++ 1 file changed, 11 insertions(+) diff --git a/t/t7508-status.sh b/t/t7508-status.sh index fb00e6d9b..e9337c728 100755 --- a/t/t7508-status.sh

[PATCH 2/2] Add test for the new status message

2017-06-18 Thread Kaartic Sivaraam
Patch-by: Ævar Arnfjörð Bjarmason Signed-off-by: Kaartic Sivaraam --- t/t7508-status.sh | 11 +++ 1 file changed, 11 insertions(+) diff --git a/t/t7508-status.sh b/t/t7508-status.sh index fb00e6d9b..e9337c728 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -1499,4 +1499,15 @@

[PATCH 1/2] Contextually notify user about an initial commit

2017-06-18 Thread Kaartic Sivaraam
"git status" indicated "Initial commit" when HEAD points at an unborn branch. This message is shared with the commit log template "git commit" prepares for the user when creating a commit (i.e. "You are about to create the initial commit"), and is OK as long as the reader is aware of the nature of

[PATCH v3] mergetools/meld: improve compatibiilty with Meld on macOS X

2017-06-18 Thread David Aguilar
The macOS X fork of Meld[1] requires a "=" in the "--output" argument, as it uses a wrapper[2] script that munges the "--output" argument before calling into the common "meld" script. The macOS X wrapper script[2] accepts "--output=" only, despite the fact that the underlying meld code accepts bot

Business

2017-06-18 Thread AG International
Dear sir/madam, My client is seeking for your trust to invest US$35 million into good projects with you as trustee.Kindly contact me only on this below e-mail: agaaintl-4g5ee...@yahoo.com , with name and your mobile phone for us to discuss privately. Eric/Director, AG International

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

2017-06-18 Thread Samuel Lijin
On Sun, Jun 18, 2017 at 8:17 PM, David Aguilar wrote: > On Sun, Jun 18, 2017 at 05:11:48AM -0400, Samuel Lijin wrote: >> On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar wrote: >> > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: >> >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar w

[PATCH v2] mergetools/meld: improve backwards-compatibiilty when using "--output"

2017-06-18 Thread David Aguilar
Meld 3.16.0 requires a "=" in the --output argument, as it uses a simple hand-rolled command-line parser. Newer versions of Meld (3.16.4, and possibly earlier) use optparse, which accepts either "--output " or "--output=". Use "--output=" for better compatibility. Signed-off-by: David Aguilar -

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

2017-06-18 Thread David Aguilar
On Sun, Jun 18, 2017 at 05:11:48AM -0400, Samuel Lijin wrote: > On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar wrote: > > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: > >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote: > >> > Meld 3.16.0 requires a "=" in the --output argu

[PATCH v2 3/3] branch: add a --copy (-c) option to go with --move (-m)

2017-06-18 Thread Sahil Dua
Add the ability to --copy a branch and its reflog and configuration, this uses the same underlying machinery as the --move (-m) option except the reflog and configuration is copied instead of being moved. This is useful for e.g. copying a topic branch to a new version, e.g. work to work-2 after su

[PATCH v2 2/3] branch: add test for -m renaming multiple config sections

2017-06-18 Thread Sahil Dua
From: Ævar Arnfjörð Bjarmason Add a test for how 'git branch -m' handles the renaming of multiple config sections existing for one branch. The config format we use is hybrid machine/human editable, and we do our best to preserve the likes of comments and formatting when editing the file with git

[PATCH v2 1/3] config: create a function to format section headers

2017-06-18 Thread Sahil Dua
Factor out the logic which creates section headers in the config file, e.g. the 'branch.foo' key will be turned into '[branch "foo"]'. This introduces no function changes, but is needed for a later change which adds support for copying branch sections in the config file. Signed-off-by: Ævar Arnfj

Re: [BUG] add_again() off-by-one error in custom format

2017-06-18 Thread Jeff King
On Sun, Jun 18, 2017 at 02:59:04PM +0200, René Scharfe wrote: > > > @@ -1586,6 +1587,9 @@ extern struct alternate_object_database { > > > struct strbuf scratch; > > > size_t base_len; > > > + uint32_t loose_objects_subdir_bitmap[8]; > > > > Is it worth the complexity of having

[PATCH v2 1/2] for_each_bisect_ref(): don't trim refnames

2017-06-18 Thread Michael Haggerty
`for_each_bisect_ref()` is called by `for_each_bad_bisect_ref()` with a term "bad". This used to make it call `for_each_ref_in_submodule()` with a prefix "refs/bisect/bad". But the latter is the name of the reference that is being sought, so the empty string was being passed to the callback as the

[PATCH v2 2/2] prefix_ref_iterator_advance(): relax the check of trim length

2017-06-18 Thread Michael Haggerty
Before the previous commit, `for_each_bad_bisect_ref()` called `for_each_fullref_in_submodule()` in such a way as to trim the whole refname away. This is a questionable use of the API, but is not ipso facto dangerous, so tolerate it in case there are other callers relying on this behavior. But cont

[PATCH v2 0/2] Fix a refname trimming problem in `log --bisect`

2017-06-18 Thread Michael Haggerty
This is v2 of these patches. Thanks to Peff and Junio for their feedback about v1 [1]. Changes since v1: * Added a test and tweaked the commit message of the first patch. As before, the second patch is optional. If it is omitted, it might flush out any other bugs like this one in client code. If

Re: "There are too many unreachable loose objects" - why don't we run 'git prune' automatically?

2017-06-18 Thread Lars Schneider
> On 10 Jun 2017, at 10:06, Jeff King wrote: > > On Fri, Jun 09, 2017 at 02:03:18PM +0200, Lars Schneider wrote: > >>> I agree the existing message isn't great. There should probably be a big >>> advise() block explaining what's going on (and that expert users can >>> disable). >> >> How about

Re: [BUG] add_again() off-by-one error in custom format

2017-06-18 Thread René Scharfe
Am 18.06.2017 um 13:49 schrieb Jeff King: On Sun, Jun 18, 2017 at 12:58:37PM +0200, René Scharfe wrote: An oid_array spends ca. 30 bytes per entry (20 bytes for a hash times a factor of 1.5 from alloc_nr). How many loose objects do we have to expect? 30 MB for a million of them sounds not too

Re: [BUG] add_again() off-by-one error in custom format

2017-06-18 Thread Jeff King
On Sun, Jun 18, 2017 at 12:58:49PM +0200, René Scharfe wrote: > Anyway, here's a patch for stat-based invalidation, on top of the other > one. Array removal is really slow (hope I didn't sneak a bug in there, > but my confidence in this code isn't very high). No locking is done; > parallel threa

Re: [BUG] add_again() off-by-one error in custom format

2017-06-18 Thread Jeff King
On Sun, Jun 18, 2017 at 12:58:37PM +0200, René Scharfe wrote: > An oid_array spends ca. 30 bytes per entry (20 bytes for a hash times > a factor of 1.5 from alloc_nr). How many loose objects do we have to > expect? 30 MB for a million of them sounds not too bad, but can there > realistically be

Re: [PATCH v5 4/5] convert: move multiple file filter error handling to separate function

2017-06-18 Thread Lars Schneider
> On 18 Jun 2017, at 09:20, Torsten Bögershausen wrote: > > > On 2017-06-01 10:22, Lars Schneider wrote: >> This is useful for the subsequent patch 'convert: add "status=delayed" to >> filter process protocol'. > > May be > Collecting all filter error handling is useful for the subsequent patc

Re: [BUG] add_again() off-by-one error in custom format

2017-06-18 Thread René Scharfe
Am 15.06.2017 um 15:25 schrieb Jeff King: > On Thu, Jun 15, 2017 at 01:33:34PM +0200, René Scharfe wrote: >> Can we trust object directory time stamps for cache invalidation? > > I think it would work on POSIX-ish systems, since loose object changes > always involve new files, not modifications of

Spende

2017-06-18 Thread Hamilton
Dies ist eine persönliche E-Mail, die an Sie gerichtet ist. Meine Namen sind Mary Hamilton, ich habe den Euro Million Jackpot von 13 Millionen Pfund im November 2014 gewonnen und ich habe gerade meine Charity Spende angefangen, indem ich eine Geldspende von $ 2.500.000,00 USD an drei (3) Gl

Re: [BUG] add_again() off-by-one error in custom format

2017-06-18 Thread René Scharfe
Am 15.06.2017 um 15:25 schrieb Jeff King: > On Thu, Jun 15, 2017 at 01:33:34PM +0200, René Scharfe wrote: >>> I'm not really sure how, though, short of caching the directory >>> contents. That opens up questions of whether and when to invalidate the >>> cache. If the cache were _just_ about short h

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

2017-06-18 Thread Samuel Lijin
On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar wrote: > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote: >> > Meld 3.16.0 requires a "=" in the --output argument, as it uses >> > a simple hand-rolled command-line parser. >> > >

Re: [PATCH/ALMOST FINAL] Contextually notify user about an initial commit

2017-06-18 Thread Ævar Arnfjörð Bjarmason
On Sun, Jun 18 2017, Kaartic Sivaraam jotted: > "git status" indicated "Initial commit" when HEAD points at > an unborn branch. This message is shared with the commit > log template "git commit" prepares for the user when > creating a commit (i.e. "You are about to create the initial > commit"),

[PATCH/ALMOST FINAL] Contextually notify user about an initial commit

2017-06-18 Thread Kaartic Sivaraam
"git status" indicated "Initial commit" when HEAD points at an unborn branch. This message is shared with the commit log template "git commit" prepares for the user when creating a commit (i.e. "You are about to create the initial commit"), and is OK as long as the reader is aware of the nature of

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

2017-06-18 Thread David Aguilar
On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: > On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote: > > Meld 3.16.0 requires a "=" in the --output argument, as it uses > > a simple hand-rolled command-line parser. > > > > Newer versions of Meld (3.16.4, and possibly earlier) use

Re: [PATCH/Almost final] wt-status.c: Modified status message shown for a parent-less branch

2017-06-18 Thread Kaartic Sivaraam
On Fri, 2017-06-16 at 06:50 -0400, Jeff King wrote: > Wouldn't you want this in cmd_commit(), not cmd_status()? > That's right. I made a little mistake while trying to replicate a change specified by Mr. Junio C. Hamano in a previous mail in this thread.  Seems there aren't any other changes requ

Re: [PATCH v5 4/5] convert: move multiple file filter error handling to separate function

2017-06-18 Thread Torsten Bögershausen
On 2017-06-01 10:22, Lars Schneider wrote: > This is useful for the subsequent patch 'convert: add "status=delayed" to > filter process protocol'. May be Collecting all filter error handling is useful for the subsequent patch 'convert: add "status=delayed" to filter process protocol'. > > Sig