Git help requested: "git stash pop" is doing an unwanted "git add". Why?

Git help requested: "git stash pop" is doing an unwanted "git add". Why?

[Alan Mackenzie]

Hello, Emacs.

I'm clearing out a "stash stack" in my master repository copy.  I've
just done "git stash pop", expecting git to pop the changes into my
working directory.

Well, there were 2 files with conflicts - fair enough.  But with all the
other files, git has had the cheek to do a "git add" (I think the jargon
for this is "moved the files to the staging area"), leaving me with the
hassle of doing a "git reset" on quite a lot of files.

Why has the "git stash pop" done this, and how can I call "git stash
pop" in the future, avoiding this annoying problem?

-- 
Alan Mackenzie (Nuremberg, Germany).

Re: Git help requested: "git stash pop" is doing an unwanted "git add". Why?

[David Kastrup]

Alan Mackenzie <acm@muc.de> writes:

> Hello, Emacs.
>
> I'm clearing out a "stash stack" in my master repository copy.  I've
> just done "git stash pop", expecting git to pop the changes into my
> working directory.
>
> Well, there were 2 files with conflicts - fair enough.  But with all the
> other files, git has had the cheek to do a "git add" (I think the jargon
> for this is "moved the files to the staging area"), leaving me with the
> hassle of doing a "git reset" on quite a lot of files.
>
> Why has the "git stash pop" done this, and how can I call "git stash
> pop" in the future, avoiding this annoying problem?

git stash saves both work directory changes as well as already staged
files.  git stash pop restores both.  So you likely git-added some files
before stashing.  Personally, I prefer to create commits (that I'll
amend afterwards) to stashes once I progressed far enough to actually
add stuff to the index.

-- 
David Kastrup

Re: Git help requested: "git stash pop" is doing an unwanted "git add". Why?

[Alan Mackenzie]

Hello, David.

On Sun, Dec 20, 2015 at 11:48:21PM +0100, David Kastrup wrote:
> Alan Mackenzie <acm@muc.de> writes:

> > Hello, Emacs.

> > I'm clearing out a "stash stack" in my master repository copy.  I've
> > just done "git stash pop", expecting git to pop the changes into my
> > working directory.

> > Well, there were 2 files with conflicts - fair enough.  But with all the
> > other files, git has had the cheek to do a "git add" (I think the jargon
> > for this is "moved the files to the staging area"), leaving me with the
> > hassle of doing a "git reset" on quite a lot of files.

> > Why has the "git stash pop" done this, and how can I call "git stash
> > pop" in the future, avoiding this annoying problem?

> git stash saves both work directory changes as well as already staged
> files.  git stash pop restores both.  So you likely git-added some files
> before stashing.

I doubt that very much.  I've only ever git-added files immediately prior
to committing.  But I suppose it's possible something in git had staged
my files without me really noticing, before doing the git stash.

> Personally, I prefer to create commits (that I'll amend afterwards) to
> stashes once I progressed far enough to actually add stuff to the
> index.

> -- 
> David Kastrup

-- 
Alan Mackenzie (Nuremberg, Germany).

Re: Git help requested: "git stash pop" is doing an unwanted "git add". Why?

[Eli Zaretskii]

> Date: Sun, 20 Dec 2015 22:01:28 +0000
> From: Alan Mackenzie <acm@muc.de>
> 
> I'm clearing out a "stash stack" in my master repository copy.  I've
> just done "git stash pop", expecting git to pop the changes into my
> working directory.
> 
> Well, there were 2 files with conflicts - fair enough.  But with all the
> other files, git has had the cheek to do a "git add" (I think the jargon
> for this is "moved the files to the staging area"), leaving me with the
> hassle of doing a "git reset" on quite a lot of files.
> 
> Why has the "git stash pop" done this, and how can I call "git stash
> pop" in the future, avoiding this annoying problem?

It's "git stash pop", yes.  You need to "git reset" after "stash pop",
if you want to be sure the changes are not staged (a.k.a. "in the
index").

Re: Git help requested: "git stash pop" is doing an unwanted "git add". Why?

[Alan Mackenzie]

Hello, Eli.

On Mon, Dec 21, 2015 at 05:35:06AM +0200, Eli Zaretskii wrote:
> > Date: Sun, 20 Dec 2015 22:01:28 +0000
> > From: Alan Mackenzie <acm@muc.de>

> > I'm clearing out a "stash stack" in my master repository copy.  I've
> > just done "git stash pop", expecting git to pop the changes into my
> > working directory.

> > Well, there were 2 files with conflicts - fair enough.  But with all the
> > other files, git has had the cheek to do a "git add" (I think the jargon
> > for this is "moved the files to the staging area"), leaving me with the
> > hassle of doing a "git reset" on quite a lot of files.

> > Why has the "git stash pop" done this, and how can I call "git stash
> > pop" in the future, avoiding this annoying problem?

> It's "git stash pop", yes.  You need to "git reset" after "stash pop",
> if you want to be sure the changes are not staged (a.k.a. "in the
> index").

It looks like it.  I've dropped a note to the git mailing list,
suggesting that this is a bug.  We'll see if anything comes of that.

-- 
Alan Mackenzie (Nuremberg, Germany).

Re: Git help requested: "git stash pop" is doing an unwanted "git add". Why?

[Mike Gerwitz]

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

On Mon, Dec 21, 2015 at 20:26:21 +0000, Alan Mackenzie wrote:
> It looks like it.  I've dropped a note to the git mailing list,
> suggesting that this is a bug.  We'll see if anything comes of that.

See git-stash(1):
         Use git stash when you want to record the current state of the
         working directory and the index

-- 
Mike Gerwitz
Free Software Hacker | GNU Maintainer
https://mikegerwitz.com
FSF Member #5804 | GPG Key ID: 0x8EE30EAB

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]

Re: Git help requested: "git stash pop" is doing an unwanted "git add". Why?

[Renaud Casenave-Péré]

In my experience, if some files are in conflict, git will add to index all
non-conflicting files to clearly separate the conflicting ones.
You are then expected to resolve the conflicts, stage the files to tell git to
accept the resolved files, and do a git reset to put everything back in the
working area.

I think this is something that is not (properly) documented and quite confusing
but when you know what to do, you get used to it…

-- 
Renaud Casenave-Péré