Bad interaction between git clean, gitignore, and deleted submodules

2017-11-20 Thread Craig Silverstein
We have the following situation: 1) A .gitignore file that contains '*.pyc' 2) A repo with a submodule named jinja2 In normal use, clients of our repo have it checked out and run things in it, creating files like jinja2/run.pyc. I deleted the jinja2 submodule (by running `git rm jinja2` and

Re: [PATCH] git-new-workdir: support submodules

2015-01-25 Thread Craig Silverstein
But then, you are saying that the update does not fix these existing issues around submodule support. So...? I guess my point is that the existing contrib script has proven to be useful to people, even though it imposes these constraints on clients wrt the config file (namely, you can't have

Re: [PATCH] git-new-workdir: support submodules

2015-01-24 Thread Craig Silverstein
...@pobox.com wrote: Craig Silverstein csilv...@khanacademy.org writes: Doesn't a submodule checkout keep some state tied to the working tree in its repository configuration file? Do you mean, in 'config' itself? If so, I don't see it. (Though it's possible there are ways to use submodules that do keep

Re: [PATCH] git-new-workdir: support submodules

2015-01-23 Thread Craig Silverstein
Ping! (now that the holidays are past) craig On Tue, Dec 23, 2014 at 1:51 PM, Craig Silverstein csilv...@khanacademy.org wrote: [Ack, I forgot to cc myself on the original patch so now I can't reply to it normally. Hopefully my workaround doesn't mess up the threading too badly.] Junio C

[PATCH] git-new-workdir: support submodules

2014-12-23 Thread Craig Silverstein
/webapp/khan-exercises and saw that /tmp/webapp/khan-exercises was populated correctly, /tmp/webapp/.git/modules/khan-exercises existed with symlinks, and /tmp/webapp/khan-exercises/.git was a file with a 'gitdir:' entry pointing to the .git/modules directory. Signed-off-by: Craig Silverstein csilv

Re: [PATCH] git-new-workdir: support submodules

2014-12-23 Thread Craig Silverstein
[Ack, I forgot to cc myself on the original patch so now I can't reply to it normally. Hopefully my workaround doesn't mess up the threading too badly.] Junio C Hamano gitster at pobox.com writes: H, does that mean that the submodule S in the original repository O's working tree and its

Re: Saving space/network on common repos

2014-12-22 Thread Craig Silverstein
some way to suppress the final 'git checkout -f' (which is the only thing in this script that needs the worktree entry to resolve somewhere) to allow for post-script cleanup. craig On Wed, Dec 17, 2014 at 4:07 PM, Jonathan Nieder jrnie...@gmail.com wrote: Craig Silverstein wrote: On Wed, Dec 17

Re: Saving space/network on common repos

2014-12-22 Thread Craig Silverstein
to do, or would we be better off just waiting for the work-tree stuff to get released? If I do end up doing it, would you be interested in a pull request (or however patches are submitted in the git world)? craig On Mon, Dec 22, 2014 at 7:12 PM, Jonathan Nieder jrnie...@gmail.com wrote: Craig

Are simultaneous fetches safe?

2014-12-19 Thread Craig Silverstein
(Separated out from another thread since this issue seems more general.) I am planning to use 'git new-workdir', which basically lets several workspaces share a single .git/refs directory. (Among other dirs in .git) It's possible that I'll end up running 'git fetch' in these workspaces

Re: Saving space/network on common repos

2014-12-17 Thread Craig Silverstein
On Wed, Dec 17, 2014 at 2:32 PM, Jonathan Nieder jrnie...@gmail.com wrote: You might find 'git new-workdir' from contrib/workdir to be helpful. It lets you attach multiple working copies to a single set of objects and refs. Thanks! That does indeed sound promising -- like a more principled

Saving space/network on common repos

2014-12-16 Thread Craig Silverstein
At Khan Academy, we are running a Jenkins installation as our build server. By design, our Jenkins machine has several different directories that each hold a copy of the same git repository. (For instance, Jenkins may be running tests on our repo at several different commits at the same time.)