git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Hard reset of a subdirectory in a sparse checkout setting

From
Kirill Müller <kirill.mueller@ivt.baug.ethz.ch>
Date
Mar 22, 2013, 10:28 UTC
Message-ID
<514C3249.7000100@ivt.baug.ethz.ch>
Hi

I can't find a neat way to "git reset --hard" a subdirectory of a checkout without reading in directories or files which are excluded by a sparse checkout. This has been asked on StackOverflow in greater detail, but the "right" answer is still missing: http://stackoverflow.com/q/15404535/946850

The options I see are:
- git checkout . (will restore excluded directories)
- git reset --hard (won't accept a path argument)
- git diff | patch -R (awkward)
What's the proper way to do this in Git?

The script below illustrates the problem. The proper command should be inserted below the "How to make files ..." comment -- the current command "git checkout -- a" will restore the file a/c/ac which is supposed to be excluded by the sparse checkout. Note that I do not want to explicitly restore a/a and a/b, I only "know" a and want to restore everything below. And I also don't "know" b, or which other directories reside on the same level as a.

Thank you for your help.
Cheers
Kirill
#!/bin/sh
rm -rf repo; git init repo; cd repo
for f in a b; do
   for g in a b c; do
     mkdir -p $f/$g
     touch $f/$g/$f$g
     git add $f/$g
     git commit -m "added $f/$g"
   done
done
git config core.sparsecheckout true
echo a/a > .git/info/sparse-checkout
echo a/b >> .git/info/sparse-checkout
echo b/a >> .git/info/sparse-checkout
git read-tree -m -u HEAD
echo "After read-tree:"
find * -type f

rm a/a/aa rm a/b/ab echo >> b/a/ba echo "After modifying:" find * -type f git status

# How to make files a/* reappear without changing b and without recreating a/c? git checkout -- a

echo "After checkout:" git status find * -type f

Next: Duy Nguyen
Message 1 of 17 in “Hard reset of a subdirectory in a sparse checkout setting”
  1. Kirill MüllerMar 22, 2013
  2. Duy NguyenMar 23, 2013
  3. Kirill MüllerMar 23, 2013
  4. checkout: add --sparse for restoring files in sparse checkout modeNguyễn Thái Ngọc Duy, Mar 24, 2013
  5. Eric SunshineMar 24, 2013
  6. Jonathan NiederMar 24, 2013
  7. Kirill MüllerMar 24, 2013
  8. Duy NguyenMar 25, 2013
  9. Jonathan NiederMar 25, 2013
  10. checkout: add --no-widen for restoring files in sparse checkout modeNguyễn Thái Ngọc Duy, Mar 30, 2013
  11. Jonathan NiederApr 1, 2013
  12. Junio C HamanoApr 1, 2013
  13. Duy NguyenApr 1, 2013
  14. Jonathan NiederApr 1, 2013
  15. checkout: add --ignore-skip-worktree-bits in sparse checkout modeNguyễn Thái Ngọc Duy, Apr 12, 2013
  16. Müller KirillMay 14, 2013
  17. Duy NguyenMay 14, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.