diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-16 19:42:50 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-16 22:25:53 +0100 |
| commit | 7f8ab8dc07ba4e892d0c2b5e7ac8436f9e845920 (patch) | |
| tree | 005c400fe384d494b3d87843d5cf0235ea7939a1 /http.c | |
| parent | fast-import: Allow "reset" to delete a new branch without error (diff) | |
| download | git-7f8ab8dc07ba4e892d0c2b5e7ac8436f9e845920.tar.xz git-7f8ab8dc07ba4e892d0c2b5e7ac8436f9e845920.zip | |
Don't update unchanged merge entries
In commit 34110cd4e394e3f92c01a4709689b384c34645d8 ("Make 'unpack_trees()'
have a separate source and destination index") I introduced a really
stupid bug in that it would always add merged entries with the CE_UPDATE
flag set. That caused us to always re-write the file, even when it was
already up-to-date in the source index.
Not only is that really stupid from a performance angle, but more
importantly it's actively wrong: if we have dirty state in the tree when
we merge, overwriting it with the result of the merge will incorrectly
overwrite that dirty state.
This trivially fixes the problem - simply don't set the CE_UPDATE flag
when the merge result matches the old state.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
0 files changed, 0 insertions, 0 deletions