The laullon branch is creating a spurious stash-like file that appears using
git status in the index and working directory.
I've got git version 1.7.4.3 installed on Mac OS X 10.6.7.
These problems happen with the tip of the laullon branch whether I've reverted
b4211b2b or not.
How to replicate the problem.
* commit two files, make changes in both and stash them, make more changes to
both:
rm -rf gitx-test
mkdir gitx-test
cd gitx-test
git init .
echo 'hello' > hello.txt
echo 'goodbye' > goodbye.txt
git add hello.txt goodbye.txt
git commit -m 'adding two files'
echo 'line2' >> hello.txt
echo 'line2' >> goodbye.txt
git stash
echo 'different line2' >> hello.txt
echo 'different line2' >> goodbye.txt
* git status shows what we expect:
[gitx-test (master)]$ git status
# On branch master
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working
directory)
#
# modified: goodbye.txt
# modified: hello.txt
#
no changes added to commit (use "git add" and/or "git commit -a")
Now open the repo in gitx (laullon branch), move the two changed files to the index then move them back out of the index and
quit gitx:
[gitx-test (master)]$ gitx
Now git status shows a new spurious file (perhaps stash-related) in the working
dir and the same file deleted from the index.
[gitx-test (master)]$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: goodbye.txt
# new file: "goodbye.txt100644
ce013625030ba8dba906f756967f9e9ca394464a\thello.txt"
# modified: hello.txt
#
# Changes not staged for commit:
# (use "git add/rm <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working
directory)
#
# deleted: "goodbye.txt100644
ce013625030ba8dba906f756967f9e9ca394464a\thello.txt"
#
The spurious file is not visible in the working dir:
[gitx-test (master)]$ ls -als
total 16
0 drwxr-xr-x 5 stephen staff 170 Apr 8 12:19 .
0 drwxr-xr-x@ 199 stephen staff 6766 Apr 8 12:19 ..
0 drwxrwsr-x 13 stephen staff 442 Apr 8 12:19 .git
8 -rw-r--r-- 1 stephen staff 24 Apr 8 12:19 goodbye.txt
8 -rw-r--r-- 1 stephen staff 22 Apr 8 12:19 hello.txt
--
- Stephen Bannasch
Concord Consortium, http://www.concord.org
