Re: [PATCH] checkout: add --sparse for restoring files in sparse checkout mode

2013-03-24 Thread Eric Sunshine
On Sun, Mar 24, 2013 at 1:06 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
 diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
 index 8edcdca..45a2b53 100644
 --- a/Documentation/git-checkout.txt
 +++ b/Documentation/git-checkout.txt
 @@ -180,6 +180,13 @@ branch by running git rm -rf . from the top level of 
 the working tree.
 +--sparse::
 +   In sparse checkout mode, `git checkout -- paths` would
 +   update all entries matched by paths regardless sparse

s/regardless/regardless of/

 +   patterns. This option only updates entries matched by paths
 +   and sparse patterns.
 +
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] checkout: add --sparse for restoring files in sparse checkout mode

2013-03-24 Thread Jonathan Nieder
Hi,

Nguyễn Thái Ngọc Duy wrote:

 --- a/Documentation/git-checkout.txt
 +++ b/Documentation/git-checkout.txt
 @@ -180,6 +180,13 @@ branch by running git rm -rf . from the top level of 
 the working tree.
  Afterwards you will be ready to prepare your new files, repopulating the
  working tree, by copying them from elsewhere, extracting a tarball, etc.

 +
 +--sparse::
 + In sparse checkout mode, `git checkout -- paths` would
 + update all entries matched by paths regardless sparse
 + patterns. This option only updates entries matched by paths
 + and sparse patterns.

Hm, should this be the default?

In principle, I would expect

git checkout -- .

to make the worktree match the index, respecting the sparse checkout.
And something like

git checkout --widen -- .

to change the sparse checkout pattern.  But of course it is easily
possible that I am missing some details of how sparse checkout is
used in practice.

What do you think?
Jonathan
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] checkout: add --sparse for restoring files in sparse checkout mode

2013-03-24 Thread Kirill Müller

Hi

On 03/24/2013 07:17 PM, Jonathan Nieder wrote:

Hi,

Nguyễn Thái Ngọc Duy wrote:


--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -180,6 +180,13 @@ branch by running git rm -rf . from the top level of the 
working tree.
  Afterwards you will be ready to prepare your new files, repopulating the
  working tree, by copying them from elsewhere, extracting a tarball, etc.

+
+--sparse::
+   In sparse checkout mode, `git checkout -- paths` would
+   update all entries matched by paths regardless sparse
+   patterns. This option only updates entries matched by paths
+   and sparse patterns.

Hm, should this be the default?

In principle, I would expect

git checkout -- .

to make the worktree match the index, respecting the sparse checkout.
And something like

git checkout --widen -- .

to change the sparse checkout pattern.  But of course it is easily
possible that I am missing some details of how sparse checkout is
used in practice.

What do you think?
Thank you for your opinion. I'd second that. When I do a sparse 
checkout, I want to see only the directories I have included and not 
excluded, unless I explicitly change that.



-Kirill
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] checkout: add --sparse for restoring files in sparse checkout mode

2013-03-24 Thread Duy Nguyen
On Mon, Mar 25, 2013 at 1:17 AM, Jonathan Nieder jrnie...@gmail.com wrote:
 +--sparse::
 + In sparse checkout mode, `git checkout -- paths` would
 + update all entries matched by paths regardless sparse
 + patterns. This option only updates entries matched by paths
 + and sparse patterns.

 Hm, should this be the default?

 In principle, I would expect

 git checkout -- .

 to make the worktree match the index, respecting the sparse checkout.
 And something like

 git checkout --widen -- .

 to change the sparse checkout pattern.  But of course it is easily
 possible that I am missing some details of how sparse checkout is
 used in practice.

 What do you think?

Changing the default may involve a painful transition phase (e.g. add
-u). I think making it the default via alias should be good enough in
most cases. We also need to think how it impacts checkout usage in
scripts. I think it might be ok, but I haven't finished my morning
coffee yet, so..
-- 
Duy
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] checkout: add --sparse for restoring files in sparse checkout mode

2013-03-24 Thread Jonathan Nieder
Duy Nguyen wrote:
 On Mon, Mar 25, 2013 at 1:17 AM, Jonathan Nieder jrnie...@gmail.com wrote:

 Hm, should this be the default?

 In principle, I would expect

 git checkout -- .

 to make the worktree match the index, respecting the sparse checkout.
 And something like

 git checkout --widen -- .

 to change the sparse checkout pattern.
[...]
 Changing the default may involve a painful transition phase (e.g. add
 -u).

I don't think it needs to.  There aren't many people using sparse
checkout even these days, and I think they'd generally be happy about
the change.

But if we want to be conservative until some later point (like 2.1),
perhaps --sparse should be named something like --no-widen?  That
way, I can do

git checkout --no-widen -- .

to make the worktree match the index, respecting the sparse checkout.
And I can do

git checkout --widen -- .

to change the sparse checkout pattern.  Meanwhile the confusing
command

git checkout -- .

would be ill-defined for sparse checkouts --- in past git versions,
if I understand you correctly it acted like --widen, while in some
unspecified future version it may change to mean --no-widen.  No
need for warnings because I doubt anyone is relying on either
behavior.

Would that work?
Jonathan
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html