I couldn't find a thread in the archive about this. Here's the
abbreviated scenario:
$ git add bar.c
$ git-rm foo.c
rm 'foo.c'
$ git-status
# On branch FOO
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: bar.c
# deleted: foo.c
#
$ git-checkout master
M bar.c
Switched to branch "master"
$ git-status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: bar.c
#
When I change branches:
- the modified files in the index/working directory stay there
(that's fine)
- the *removed* files are re-added to the working directory when the
branch changes
- the remove entries aren't in the index anymore
There was no warning about any the lost changes, and if the intent
was to commit these changes to master because you were in FOO by
accident, then only some would be committed if you weren't paying
close attention. If working directory/index changes are going to be
kept when a branch switch is done, then the remove changes should be
propagated as well.
Ideally there would be a config setting which would stop checkouts if
the working directory or index were dirty (and a flag on checkout
which overrode the setting). With stash in 1.5.3 the only reason I
can think of to allow working directory changes to propagate is gone
(though i haven't tested how stash works with rm'd files). At the
very least, there should be a warning and a prompt if some of the
changes are going to vanish by a user action
-Jeff Jenkins
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
