On Mon, Oct 7, 2019 at 11:52 PM Josef Wolf <jw@xxxxxxxxxxxxx> wrote: > > Hello, > > This is a repost, since the original message seems to have been lost somehow. > > > I am trying to add a file to an arbitrary branch without touching the current > worktree with as little overhead as possible. This should work no matter in > which state the current worktree is in. And it should not touch the current WT > in any way. > > For this, the sparse-checkout feature in conjuntion with the "shared > repository" feature seems to be perfect. I can see the logical progression that a sparse worktree would be less overhead than a full worktree, and that a bare worktree would be even better. But you're still dealing with unnecessary overhead; you don't need a worktree at all to achieve what you want. Traditionally, if you wanted to modify another branch without touching the worktree at all, you would use a combination of hash-object, mktree, commit-tree, and update-ref. That would be a better solution to your problem than trying to approximate it with a sparse checkout. However, that's at least four invocations of git, and you said as little overhead as possible, so I'd recommend you use fast-import. But, since you asked some other questions about sparse checkouts... > The basic idea goes like this: > > > TMP=`mktemp -d /var/tmp/test-XXXXXXXXX` > GD=$TMP/git > WD=$TMP/wd > > git --work-tree $WD --git-dir $GD clone -qns -n . $GD > git --work-tree $WD --git-dir $GD config core.sparsecheckout true > echo path/of/file/which/I/want/to/create >>$GD/info/sparse-checkout > > git --work-tree $WD --git-dir $GD checkout -b some-branch remotes/origin/some-branch # !!! > > ( cd $WD > mkdir -p path/of/file/which/I/want/to > echo huhuh >path/of/file/which/I/want/to/create > git --work-tree $WD --git-dir $GD add path/of/file/which/I/want/to/create > git --work-tree $WD --git-dir $GD commit > git --work-tree $WD --git-dir $GD push > ) > > rm -rf $TMP > > > Unfortunately, the marked command errors out with > > "error: Sparse checkout leaves no entry on working directory" > > and won't create/switch to the branch that is to be modified. > > Why is this an error? Since there are no matching files, an empty worktree > is EXACTLY what I wanted. Why will the "git checkout -b" command error out? It is very easy to mess up the sparse specifications. We can't check for all errors, but a pretty obvious one is when people specify restrictions that match no path. We can at least give an error in that case. There are times when folks might intentionally specify paths that don't match anything, but they are quite rare. The ones I can think of: 1) When they are doing something exotic where they are just trying to approximate something else rather than actual use sparse checkouts as intended. 2) When they've learned about sparse checkouts and just want to test what things are like in extreme situations. Case 1 consists of stuff like what you are doing here, for which there are better solutions, or when I was attempting to simulate the performance issues microsoft folks were having with a really large repo and knowing they used sparse checkouts as part of VFS-for-git (I created a very large index and had no entries checked out at first, but then ran into these errors, and added one file to the index and had a sparse specification match it.) For case 2, people learn that an empty working tree is a too extreme situation that we'll throw an error at and so they adjust and make sure to match at least one path. > Strange enough, I have some repositories at this machine where the > .git/info/sparse-checkout file contains only non-existing files and git > happily executes this "git checkout -b XXX remotes/origin/XXX" command leaving > the working tree totally empty all the time. I can't reproduce: $ git config core.sparseCheckout true $ echo 'non-existent' > .git/info/sparse-checkout $ git checkout -b next origin/next error: Sparse checkout leaves no entry on working directory Can you provide any more details about how you get into this state? > Someone understands this inconsistent behaviour? No, but I wouldn't be surprised if there are bugs and edge cases. I think I ran into one or two when testing things out, didn't take good enough notes, and had trouble reproducing later. The sparse checkout stuff has been under-tested and not well documented, something Stolee is trying to fix right now.
