Bugzilla – Full Text Bug Listing
| Summary: | Untracked changes should be visible in stash commits | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | Ken Walker <ken_walker> | ||||||
| Component: | Git | Assignee: | Project Inbox <orion.git-inbox> | ||||||
| Status: | RESOLVED FIXED | QA Contact: | |||||||
| Severity: | normal | ||||||||
| Priority: | P3 | CC: | gheorghe, maciej.bendkowski, pwebster | ||||||
| Version: | 6.0 | ||||||||
| Target Milestone: | 7.0 | ||||||||
| Hardware: | PC | ||||||||
| OS: | Mac OS X | ||||||||
| Whiteboard: | |||||||||
| Attachments: |
|
||||||||
|
Description
Ken Walker
Created attachment 245913 [details]
Shows a new files and a changed file
Created attachment 245914 [details]
Shows the stash only containing the changed file
Yes, it should. It actually did that, although the stash commit is empty (as untracked files are *not* included there). There was however a trivial issue with applying such changes - already fixed in master. We should include untracked changes in the commit somehow and make it intuitive which changes are tracked and which are not. Changing the summary to be more accurate. Normally when you stash, it effects the files in the index. It doesn't effect untracked new files (i.e. they just stay there, and still show up as untracked). PW (In reply to Paul Webster from comment #5) > Normally when you stash, it effects the files in the index. It doesn't > effect untracked new files (i.e. they just stay there, and still show up as > untracked). That would certainly resolve the problem of showing them in the stash. If we however want to have the "git stash --untracked" as well, we should have a dedicated view for stashed untracked changes and apply the same approach as for "push" and "push --branch". I changed the default stash behavior - untracked changes are now *not* included by default. Until we figure out the presentation of untracked changes in the stash - we should not enable it back. Restored this functionality as we now have a way of showing the different stashes: 1) Stash away your changes 2) Select your stash from the Refs drop down -> you will now see your stashes displayed as incoming commits against your active branch Note that you will see multiple entries for the same stash. JGit creates 3 commits (same title, different SHA) for a stash: one for the work in progress (ie all of your working dir minus any new files), another one for files that have been staged and another one for any new files. |