Nathaniel Mishkin <[email protected]> writes:

> First (and as you've probably surmised), I'm doing all this in a repo with
> a lot of files in it.
>
> Scenario:
>
> * I modify one tracked file and add one untracked file. "git status" shows
> the expected output (info about both the change and the untracked file).

If there is only one untracked file, I don't think being in a repo with
a lot of files should make too much of a difference.  The diff should be
small (assuming the untracked files isn't huge) because the git diff
call is limited to the untracked file.

> * I do "git stash show" and it shows "1 file changed, ...". I can't find an
> option to make it say anything about untracked files in the stash.

I'm not aware of an easy way to do this.  The command line version of
what Magit does to get the diff of untracked changes is essentially

    $ git diff stash@{0}^..stash@{0}^3 -- $(git ls-tree --name-only -r 
--full-tree stash@{0}^3)

The second part limits it to the untracked files, as I mentioned above.
If you do not include this, you will get a large diff (showing all
tracked files as deleted) due to how stashes are stored.

> * In Magit I attempt to look at the stash and as I described earlier it
> hangs until I C-g out.

Since you said aborting shows a diff with many files even when you only
had one untracked file, perhaps something's going wrong with retrieving
the list of untracked files, resulting in all files being diffed.  You
could try to step through magit-insert-stash-untracked to see what the
output of

    (magit-git-items "ls-tree" "-z" "--name-only" "-r" "--full-tree" rev)

is.

--
Kyle

-- 
You received this message because you are subscribed to the Google Groups 
"magit" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to