Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: Bug? git show behaves incorrectly when called on a stash object

From: Matthieu Moy <hidden>
Date: 2016-06-15 22:56:27

Kirill Likhodedov [off-list ref] writes:
The first gives the correct result, while the second doesn't show the addition.
Is it a bug, or I'm just missing something?
stash objects are commits with 2 parents (ie. merge commits). One commit
is the HEAD you stashed from, and the other is the saved state of the
index. I'm not sure from the doc what the semantics of --name-status is
for merge commits, but it seems it shows only files modified in both
parents.

Use git show --first-parent --name-status, it should do what you expect
(or -m instead of --first-parent).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help