From: Nguyễn Thái Ngọc Duy Date: Mon, 18 Mar 2019 11:38:22 +0000 (+0700) Subject: unpack-trees: fix oneway_merge accidentally carry over stage index X-Git-Tag: v2.22.0-rc0~108^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ab5af825db8beaf623f8ac95e4b4179ec1b9569e?hp=ab5af825db8beaf623f8ac95e4b4179ec1b9569e unpack-trees: fix oneway_merge accidentally carry over stage index Phillip found out that 'git checkout -f ' does not restore conflict/unmerged files correctly. All tracked files should be taken from and all non-zero stages removed. Most of this is true, except that the final file could be in stage one instead of zero. "checkout -f" (among other commands) does this with one-way merge, which is supposed to take stat info from the index and everything else from the given tree. The add_entry(.., old, ...) call in oneway_merge() though will keep stage index from the index. This is normally not a problem if the entry from the index is normal (stage #0). But if there is a conflict, stage #0 does not exist and we'll get stage #1 entry as "old" variable, which gets recorded in the final index. Fix it by clearing stage mask. This bug probably comes from b5b425074e (git-read-tree: make one-way merge also honor the "update" flag, 2005-06-07). Before this commit, we may create the final ("dst") index entry from the one in index, but we do clear CE_STAGEMASK. I briefly checked two- and three-way merge functions. I think we don't have the same problem in those. Reported-by: Phillip Wood Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano ---