From: "Kirill Müller" <kirill.mueller@ivt.baug.ethz.ch>
To: <git@vger.kernel.org>
Subject: Hard reset of a subdirectory in a sparse checkout setting
Date: Fri, 22 Mar 2013 11:28:25 +0100 [thread overview]
Message-ID: <514C3249.7000100@ivt.baug.ethz.ch> (raw)
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 reply other threads:[~2013-03-22 10:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-22 10:28 Kirill Müller [this message]
2013-03-23 9:59 ` Hard reset of a subdirectory in a sparse checkout setting Duy Nguyen
2013-03-23 13:02 ` Kirill Müller
2013-03-24 5:06 ` [PATCH] checkout: add --sparse for restoring files in sparse checkout mode Nguyễn Thái Ngọc Duy
2013-03-24 6:12 ` Eric Sunshine
2013-03-24 18:17 ` Jonathan Nieder
2013-03-24 19:50 ` Kirill Müller
2013-03-25 1:34 ` Duy Nguyen
2013-03-25 1:57 ` Jonathan Nieder
2013-03-30 10:02 ` [PATCH v2] checkout: add --no-widen " Nguyễn Thái Ngọc Duy
2013-04-01 4:48 ` Jonathan Nieder
2013-04-01 5:12 ` Junio C Hamano
2013-04-01 5:13 ` Duy Nguyen
2013-04-01 6:18 ` Jonathan Nieder
2013-04-12 23:12 ` [PATCH v3] checkout: add --ignore-skip-worktree-bits " Nguyễn Thái Ngọc Duy
2013-05-14 9:27 ` Müller Kirill
2013-05-14 10:21 ` Duy Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=514C3249.7000100@ivt.baug.ethz.ch \
--to=kirill.mueller@ivt.baug.ethz.ch \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.