aboutsummaryrefslogtreecommitdiff
path: root/t/t3415-rebase-autosquash.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-08 17:27:43 -0700
committerJunio C Hamano <gitster@pobox.com>2010-07-08 17:27:43 -0700
commitb1f47514f207b0601de7b0936cf13b3c0ae70081 (patch)
tree351921dd5f5bec0f58804cd94f426006f81b6c38 /t/t3415-rebase-autosquash.sh
parent29981380d03ffa63765dbeaea53a7ac9e8d6bc4f (diff)
downloadgit-b1f47514f207b0601de7b0936cf13b3c0ae70081.tar.gz
git-b1f47514f207b0601de7b0936cf13b3c0ae70081.tar.xz
Fix "read-tree -m A B" priming the cache-tree
In 456156d a shortcut to priming the index tree reference was introduced, but the justification for it was completely bogus. "read-tree -m A B" is to take the index (and the working tree) that is largely based on (but does not have to match exactly) A and update it to B, while carrying the local change that does not overlap the difference between A and B, so there is no reason to expect that the resulting index should match the tree B. Noticed and test provided by Heiko Voigt. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3415-rebase-autosquash.sh')
0 files changed, 0 insertions, 0 deletions