Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Jeff King
On Thu, Dec 01, 2016 at 08:09:16AM +0100, Johannes Sixt wrote: > Am 01.12.2016 um 00:40 schrieb Jeff King: > > 20813 access("su:b/../.git/modules/su:b/refs", X_OK) = 0 > > Side note: where does this weirdness "su:b" come from? (I haven't looked at > any of the patches, yet, let alone tested.) Col

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Johannes Sixt
Am 01.12.2016 um 00:40 schrieb Jeff King: 20813 access("su:b/../.git/modules/su:b/refs", X_OK) = 0 Side note: where does this weirdness "su:b" come from? (I haven't looked at any of the patches, yet, let alone tested.) Colons in file or directory names won't work on Windows (in the way one wo

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Brandon Williams
On 11/30, Stefan Beller wrote: > > Oh interesting, I wonder if there is a way to not have to perform a > > chdir since taking a lock to lstat wouldn't be ideal. > > I think we could rewrite is_submodule_populated to be > > int is_submodule_populated_cheap_with_no_chdir(char *path) > { > retur

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Jeff King
On Wed, Nov 30, 2016 at 04:06:05PM -0800, Brandon Williams wrote: > On 11/30, Jeff King wrote: > > So I think there is some other chdir(). I'm not sure if there is an easy > > way to get a backtrace on every call to chdir() in every thread. I'm > > sure somebody more clever than me could figure ou

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Stefan Beller
> Oh interesting, I wonder if there is a way to not have to perform a > chdir since taking a lock to lstat wouldn't be ideal. I think we could rewrite is_submodule_populated to be int is_submodule_populated_cheap_with_no_chdir(char *path) { return stat(path + ".git") } i.e. just take the pre

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Brandon Williams
On 11/30, Jeff King wrote: > On Wed, Nov 30, 2016 at 06:59:52PM -0500, Jeff King wrote: > > > So I think there is some other chdir(). I'm not sure if there is an easy > > way to get a backtrace on every call to chdir() in every thread. I'm > > sure somebody more clever than me could figure out how

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Brandon Williams
On 11/30, Jeff King wrote: > So I think there is some other chdir(). I'm not sure if there is an easy > way to get a backtrace on every call to chdir() in every thread. I'm > sure somebody more clever than me could figure out how to make gdb do it > automatically, but it might be workable manually.

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Jeff King
On Wed, Nov 30, 2016 at 06:59:52PM -0500, Jeff King wrote: > So I think there is some other chdir(). I'm not sure if there is an easy > way to get a backtrace on every call to chdir() in every thread. I'm > sure somebody more clever than me could figure out how to make gdb do it > automatically, b

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Jeff King
On Wed, Nov 30, 2016 at 06:46:36PM -0500, Jeff King wrote: > > For now the work around could be to just pass "-C " to the child > > process instead of relying on run-command to chdir. > > Yeah, that would push it after the exec. I just don't understand why > that would be necessary. Hmm. It stil

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Brandon Williams
On 11/30, Jeff King wrote: > On Wed, Nov 30, 2016 at 03:42:48PM -0800, Brandon Williams wrote: > > > > where 20813 and 20867 are two threads of the main process. One is doing > > > the lstat and the other calls chdir at the same moment. > > > > Yeah so it looks like the start_command function call

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Jeff King
On Wed, Nov 30, 2016 at 03:42:48PM -0800, Brandon Williams wrote: > > where 20813 and 20867 are two threads of the main process. One is doing > > the lstat and the other calls chdir at the same moment. > > Yeah so it looks like the start_command function calls chdir. Which > means any uses of the

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Brandon Williams
On 11/30, Jeff King wrote: > On Wed, Nov 30, 2016 at 06:32:04PM -0500, Jeff King wrote: > > > On Wed, Nov 30, 2016 at 03:28:23PM -0800, Brandon Williams wrote: > > > > > So I couldn't find a race condition in the code. I tracked the problem > > > to grep_source_load_file which attempts to run ls

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Stefan Beller
On Wed, Nov 30, 2016 at 3:40 PM, Jeff King wrote: > On Wed, Nov 30, 2016 at 06:32:04PM -0500, Jeff King wrote: > >> On Wed, Nov 30, 2016 at 03:28:23PM -0800, Brandon Williams wrote: >> >> > So I couldn't find a race condition in the code. I tracked the problem >> > to grep_source_load_file which

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Jeff King
On Wed, Nov 30, 2016 at 06:32:04PM -0500, Jeff King wrote: > On Wed, Nov 30, 2016 at 03:28:23PM -0800, Brandon Williams wrote: > > > So I couldn't find a race condition in the code. I tracked the problem > > to grep_source_load_file which attempts to run lstat on the file so that > > it can read

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Jeff King
On Wed, Nov 30, 2016 at 03:28:23PM -0800, Brandon Williams wrote: > So I couldn't find a race condition in the code. I tracked the problem > to grep_source_load_file which attempts to run lstat on the file so that > it can read it into a buffer. The lstat call fails with ENOENT (which > convenie

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Brandon Williams
On 11/30, Brandon Williams wrote: > On 11/29, Jeff King wrote: > > On Tue, Nov 29, 2016 at 01:37:59AM -0500, Jeff King wrote: > > > > > 2. Grep threads doing more complicated stuff that needs to take a > > > lock. You might try building with -fsanitize=thread to see if it > > > turns u

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-30 Thread Brandon Williams
On 11/29, Jeff King wrote: > On Tue, Nov 29, 2016 at 01:37:59AM -0500, Jeff King wrote: > > > 2. Grep threads doing more complicated stuff that needs to take a > > lock. You might try building with -fsanitize=thread to see if it > > turns up anything. > > I tried this and it didn't fi

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-29 Thread Stefan Beller
On Tue, Nov 29, 2016 at 11:21 AM, Stefan Beller wrote: > >> >> * dt/empty-submodule-in-merge (2016-11-17) 1 commit >> - submodules: allow empty working-tree dirs in merge/cherry-pick >> >> Waiting for review > > That slipped by me. Will review. > I reviewed what you have queued and it still loo

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-29 Thread Stefan Beller
On Tue, Nov 29, 2016 at 11:26 AM, Junio C Hamano wrote: >>> Need to read it over again, deal with SQUASH, and may ask for a >>> reroll. >> >> Ok, I looked over it again and I may see some issues: > > OK then I'll procrastinate on this. This is not what I had in mind when typing out the issues.

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-29 Thread Junio C Hamano
Stefan Beller writes: > On Mon, Nov 28, 2016 at 4:15 PM, Junio C Hamano wrote: >> >> * sb/push-make-submodule-check-the-default (2016-10-10) 2 commits >> - push: change submodule default to check when submodules exist >> - submodule add: extend force flag to add existing repos >> >> Turn the

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-29 Thread Stefan Beller
On Mon, Nov 28, 2016 at 4:15 PM, Junio C Hamano wrote: > > * sb/push-make-submodule-check-the-default (2016-10-10) 2 commits > - push: change submodule default to check when submodules exist > - submodule add: extend force flag to add existing repos > > Turn the default of "push.recurseSubmodul

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-29 Thread Jeff King
On Tue, Nov 29, 2016 at 10:31:51AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I'm actually considering scrapping the approach you've queued above, and > > just teaching verify_path() to reject any index entry starting with > > ".git" that is a symlink. > > Hmph, that's a thought. I

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-29 Thread Junio C Hamano
Jeff King writes: > I'm actually considering scrapping the approach you've queued above, and > just teaching verify_path() to reject any index entry starting with > ".git" that is a symlink. Hmph, that's a thought.

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-28 Thread Jeff King
On Mon, Nov 28, 2016 at 04:15:08PM -0800, Junio C Hamano wrote: > * jk/nofollow-attr-ignore (2016-11-02) 5 commits > - exclude: do not respect symlinks for in-tree .gitignore > - attr: do not respect symlinks for in-tree .gitattributes > - exclude: convert "check_index" into a flags field > -

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-28 Thread Jeff King
On Tue, Nov 29, 2016 at 01:37:59AM -0500, Jeff King wrote: > 2. Grep threads doing more complicated stuff that needs to take a > lock. You might try building with -fsanitize=thread to see if it > turns up anything. I tried this and it didn't find anything useful. It complains about mu

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-28 Thread Jeff King
On Mon, Nov 28, 2016 at 05:05:38PM -0800, Brandon Williams wrote: > On 11/28, Junio C Hamano wrote: > > * bw/grep-recurse-submodules (2016-11-22) 6 commits > > - grep: search history of moved submodules > > - grep: enable recurse-submodules to work on objects > > - grep: optionally recurse int

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-28 Thread Brandon Williams
On 11/28, Junio C Hamano wrote: > * bw/grep-recurse-submodules (2016-11-22) 6 commits > - grep: search history of moved submodules > - grep: enable recurse-submodules to work on objects > - grep: optionally recurse into submodules > - grep: add submodules as a grep source type > - submodules:

What's cooking in git.git (Nov 2016, #06; Mon, 28)

2016-11-28 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. You can find the changes described