| commit | 7aa5d43cc6204efab0d2c2f4fbf46d2cfd350fec | |
| author | Charles Bailey <charles@hashpling.org> | |
| Sun, 18 Apr 2010 18:28:05 +0000 (18 19:28 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 18 Apr 2010 22:00:03 +0000 (18 15:00 -0700) | ||
| tree | 9f764508a8311e7ee4bfa6848169da3047aea8c4 | treesnapshot (tar.gz zip) |
| parent | 53b3c47d64b4294ae586d1daa04f9140dadd9ae6 | commitdiff |
stash: Don't overwrite files that have gone from the index
The use of git add -u in create_stash isn't always complete. In
particular, if a file has been removed from the index but changed in the
work tree it will not be added to the stash's saved work tree tree
object. When stash then resets the work tree to match HEAD, any changes
will be lost.
To be complete, any work tree file which differs from HEAD needs to be
saved, regardless of whether it still appears in the index or not.
This is achieved with a combination of a diff against HEAD and a call to
update-index with an explicit list of paths that have changed.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The use of git add -u in create_stash isn't always complete. In
particular, if a file has been removed from the index but changed in the
work tree it will not be added to the stash's saved work tree tree
object. When stash then resets the work tree to match HEAD, any changes
will be lost.
To be complete, any work tree file which differs from HEAD needs to be
saved, regardless of whether it still appears in the index or not.
This is achieved with a combination of a diff against HEAD and a call to
update-index with an explicit list of paths that have changed.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-stash.sh | diffblobblamehistory |