diff options
author | Jeff King <peff@peff.net> | 2014-11-13 13:30:34 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-11-13 14:35:41 -0800 |
commit | c5326bd62b7e168ba1339dacb7ee812d0fe98c7c (patch) | |
tree | c2eff6145f8367208cd648a6b19dcdcaee459e0d /Documentation/git-fmt-merge-msg.txt | |
parent | git-tag.txt: Add a missing hyphen to `-s` (diff) | |
download | tgif-c5326bd62b7e168ba1339dacb7ee812d0fe98c7c.tar.xz |
checkout $tree: do not throw away unchanged index entries
When we "git checkout $tree", we pull paths from $tree into
the index, and then check the resulting entries out to the
worktree. Our method for the first step is rather
heavy-handed, though; it clobbers the entire existing index
entry, even if the content is the same. This means we lose
our stat information, leading checkout_entry to later
rewrite the entire file with identical content.
Instead, let's see if we have the identical entry already in
the index, in which case we leave it in place. That lets
checkout_entry do the right thing. Our tests cover two
interesting cases:
1. We make sure that a file which has no changes is not
rewritten.
2. We make sure that we do update a file that is unchanged
in the index (versus $tree), but has working tree
changes. We keep the old index entry, and
checkout_entry is able to realize that our stat
information is out of date.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
0 files changed, 0 insertions, 0 deletions