submodule: --recurse-submodules vs. submodule.recurse=true

2017-08-31 Thread Magnus Homann
I'm using git 2.14.1 on cygwin. Using --recurse-submodules, I can do 'git pull' and the submodules both get fetched and merged automatically. I was under the impression that setting submodule.recurse to true would have the same affect, without needing to write --recurse-submodules every time. B

Re: [PATCH 0/1] Add stash entry count summary to short status output

2017-08-31 Thread Jonathan Nieder
Hi Sonny, Sonny Michaud wrote: > Any assistance would be greatly appreciated; I just wanted to get > started by hacking first and asking questions later!      Welcome to the Git project, and sorry for the silence before. Getting to see what people are working on is one of th

Greetings

2017-08-31 Thread heying
hi,i have a proposal of charity for you,email me back if interested. mrs,Ann Johnson

Follow Up re:

2017-08-31 Thread Raymond Rhule
Hello, I have tried to get in contact with you previously, however I am not sure you got my previous email. I am reaching out to you again today because I have a Proposal you maybe in interested in. I have chosen to contact you directly because I need a reliable partner I can trust; who can hel

Your response is required

2017-08-31 Thread Dean
Hello there, I sent you an email yesterday with a proposal that I think is going to be of mutual benefit but I did not receive a response from you yet so I am sending you this follow up to confirm if you actually received my email yesterday. Please let me know if you did not receive my proposal

Can we have a business discussion?

2017-08-31 Thread Claudio Nonne
Sorry for the inconvenience,Can we have a business discussion? This will help provide you capital and increase your finance.We give out urgent Loan to serious minded individuals Firms or Companies who are in need of financial assistance for any kind.reply me for more info on: association_appro

Re: [PATCH 0/1] Add stash entry count summary to short status output

2017-08-31 Thread Sonny Michaud
Junio, I appreciate you taking the time to look over this patch.  I have some comments below before re-submitting an updated version. On 08/24/2017 04:07 PM, Junio C Hamano wrote: > Sonny Michaud writes: > >> diff --git a/wt-status.c b/wt-status.c >> >>

Re: git-scm pages deliver outdated Git docs

2017-08-31 Thread Jeff King
On Thu, Aug 31, 2017 at 09:28:35AM +0100, Lars Schneider wrote: > looks like the git-scm pages deliver outdated Git docs (v2.13.1): > https://git-scm.com/docs/git > > Is this intentional? If not, who should be contacted? The docs are up-to-date (and a cron job keeps them updated when there are n

Re: [PATCH 2/3] merge-recursive: remove return value from get_files_dirs

2017-08-31 Thread Stefan Beller
On Tue, Aug 29, 2017 at 8:58 AM, Kevin Willford wrote: >> >> On Mon, Aug 28, 2017 at 02:28:28PM -0600, Kevin Willford wrote: >> >> > The return value of the get_files_dirs call is never being used. >> > Looking at the history of the file and it was originally only >> > being used for debug output

Re: [PATCH 00/34] plug strbuf memory leaks

2017-08-31 Thread Stefan Beller
On Wed, Aug 30, 2017 at 10:49 AM, Rene Scharfe wrote: > Release allocated strbufs in functions that are at least potentionally > library-like; cmd_*() functions are out of scope because the process > ends with them and the OS cleans up for us anyway. The patches are > split by function and were g

Re: [PATCH 10/34] diff: release strbuf after use in diff_summary()

2017-08-31 Thread Stefan Beller
On Wed, Aug 30, 2017 at 10:49 AM, Rene Scharfe wrote: > Signed-off-by: Rene Scharfe This was careless programming in the recent 146fdb0dfe (diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY, 2017-06-29) I missed the cleanup. Thanks, Stefan

Re: [PATCH 08/34] connect: release strbuf on error return in git_connect()

2017-08-31 Thread Stefan Beller
> } else { > + struct strbuf cmd = STRBUF_INIT; > + ... > strbuf_addstr(&cmd, prog); > strbuf_addch(&cmd, ' '); > sq_quote_buf(&cmd, path); ... > if (start_command(conn)) > die("unable to

Re: [PATCH 07/34] commit: release strbuf on error return in commit_tree_extended()

2017-08-31 Thread Stefan Beller
On Wed, Aug 30, 2017 at 10:49 AM, Rene Scharfe wrote: > Signed-off-by: Rene Scharfe > --- > commit.c | 7 +-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/commit.c b/commit.c > index 8b28415939..51f969fcbc 100644 > --- a/commit.c > +++ b/commit.c > @@ -1514,60 +1514,63

Re: [PATCH 01/34] am: release strbufs after use in detect_patch_format()

2017-08-31 Thread Stefan Beller
On Wed, Aug 30, 2017 at 10:49 AM, Rene Scharfe wrote: > Don't reset the strbufs l2 and l3 before use as if they were static, but > release them at the end instead. > > Signed-off-by: Rene Scharfe This was introduced with 5ae41c79b8 (builtin-am: support and auto-detect StGit patches, 2015-08-04),

Re: [PATCH 17/34] mailinfo: release strbuf on error return in handle_boundary()

2017-08-31 Thread René Scharfe
Am 30.08.2017 um 20:23 schrieb Martin Ågren: > On 30 August 2017 at 19:49, Rene Scharfe wrote: >> Signed-off-by: Rene Scharfe >> --- >> mailinfo.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/mailinfo.c b/mailinfo.c >> index b1f5159546..f2387a3267 100644 >> --- a/mailinfo.c >> +

Re: Bug report

2017-08-31 Thread Stephan Beyer
On 08/31/2017 08:36 AM, Kevin Daudt wrote: > On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote: >> I have a file >> >> app/Controller/CustomerCardVerificationController.php >> >> And when I take a look at changes log, I get this (no matter which tool I >> use): >> >> 2017-07-31 19:

Re: Bug report

2017-08-31 Thread Aleksandar Pavic
Hm, thanks, but the link was not helpful, there are no merge commits to master branch. Those changes should have not been undone, that's how we caught it, because 1 line peace of code introduced new feature (+-10% tolerance on credit card verification amount). So most likeley they were undo

Re: [PATCH v3] Documentation: mention that `eol` can change the dirty status of paths

2017-08-31 Thread Torsten Bögershausen
On 2017-08-31 15:19, Ben Boeckel wrote: > This attribute sets a specific line-ending style to be used in the > working directory. It enables end-of-line conversion without any > -content checks, effectively setting the `text` attribute. > +content checks, effectively setting the `text` attribut

Re: Bug report

2017-08-31 Thread Dov Grobgeld
The following answer that I got back in 2015 from Jeff King might be relevant to your problem: https://marc.info/?l=git&m=144178948506788&w=2 Regards, Dov On Thu, Aug 31, 2017 at 9:36 AM, Kevin Daudt wrote: > On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote: >> I have a file >>

Re: [PATCH v2/RFC] commit: change the meaning of an empty commit message

2017-08-31 Thread Kaartic Sivaraam
On Thu, 2017-08-24 at 13:19 -0700, Junio C Hamano wrote: > > The latter is easier for me as we do not have to worry about > breaking people's scripts and tools used in > their established workflows at all. > In that case, how about doing something similar to what was done to 'set-upstream' opti

[PATCH v3] Documentation: mention that `eol` can change the dirty status of paths

2017-08-31 Thread Ben Boeckel
When setting the `eol` attribute, paths can change their dirty status without any change in the working directory. This can cause confusion and should at least be mentioned with a remedy. Reviewed-by: Torsten Bögershausen Reviewed-by: Junio C Hamano Signed-off-by: Ben Boeckel --- Documentation

Re: [PATCH] Documentation: mention that `eol` can change the dirty status of paths

2017-08-31 Thread Ben Boeckel
On Wed, Aug 30, 2017 at 14:31:30 -0700, Junio C Hamano wrote: > Is this "always makes them dirty" or "may make them dirty depending > on the situation"? > > If the latter, I'd prefer to see s/makes/may make/ here. Yes, a coworker reported that some files slipped through this. New patch incoming

Hello

2017-08-31 Thread Mr.Austin Lizin
Season Greetings I would want to know from you the type of investment someone can Establish in your country that can be very Lucrative capable of generating 20% annual return on investment . Kindly furnish me with full investment strategy and/or business plan for my study. For we to negotiate t

Re: Produce contents of index with existing directory as cache

2017-08-31 Thread Florian Weimer
On 08/30/2017 04:55 PM, David Lloyd wrote: > On Wed, Aug 30, 2017 at 9:18 AM, Florian Weimer wrote: >> On 08/30/2017 04:15 PM, David Lloyd wrote: >>> git reset --hard ? >> >> That doesn't remove unstaged files. > Ah, does it not? Perhaps add a "git clean -d -f" as well. It would have to be “git

git-scm pages deliver outdated Git docs

2017-08-31 Thread Lars Schneider
Hi, looks like the git-scm pages deliver outdated Git docs (v2.13.1): https://git-scm.com/docs/git Is this intentional? If not, who should be contacted? Cheers, Lars