suggestion for git stash

Hi,

"git stash" has the effect of losing the distinction between untracked changes and changes in the index.

To reproduce:
- Clone the gnulib repository or of any repository with at least 2 files.
- Make changes to two files, say, README and NEWS.
  $ git add README
- $ git status
  now reports:
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   README
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#       modified:   NEWS
#

- $ git stash
- $ git stash apply
- $ git status
  now reports:
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#       modified:   NEWS
#       modified:   README
#
no changes added to commit (use "git add" and/or "git commit -a")

Could "git stash" be changed to memorize which changes were already scheduled for commit and which didn't?

Bruno

Isn't "stash apply --index" what you talk about?

Junio C Hamano <gitster@pobox.com> writes:

It doesn't seem to be documented in Documentation/git-stash.txt, but seems to be the answer.

Junio C Hamano wrote:

Not really:

$ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: README # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # # modified: NEWS # $ git stash Saved "WIP on master: 61135ee... Use check_PROGRAMS instead of noinst_PROGRAMS." HEAD is now at 61135ee... Use check_PROGRAMS instead of noinst_PROGRAMS. $ git stash apply --index error: No changes Conflicts in index. Try without --index.

(This is git version 1.5.3.1.)

I don't know what "git stash apply --index" does, since it's not documented.

Bruno

Hi,

On Sun, 30 Sep 2007, Bruno Haible wrote:

It's documented in code ;-)

No, really, what it does is trying to reinstate not only the working tree's changes, but also the index' ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally).

Now that you know what --index is supposed to do, maybe you are nice enough to extend the documentation and post a patch?

Thanks, Dscho

---

On Sun, Sep 30, 2007 at 10:29:05PM +0100, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

something like this?

VMiklos

 Documentation/git-stash.txt |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)