Re: [PATCH] oneway_merge(): only lstat() when told to update worktree

2012-12-20 Thread Junio C Hamano
Martin von Zweigbergk writes: > Although the subject line of 613f027 (read-tree -u one-way merge fix > to check out locally modified paths., 2006-05-15) mentions "read-tree > -u", it did not seem to check whether -u was in effect. Not checking > whether -u is in effect makes e.g. "read-tree --res

[PATCH] oneway_merge(): only lstat() when told to update worktree

2012-12-20 Thread Martin von Zweigbergk
Although the subject line of 613f027 (read-tree -u one-way merge fix to check out locally modified paths., 2006-05-15) mentions "read-tree -u", it did not seem to check whether -u was in effect. Not checking whether -u is in effect makes e.g. "read-tree --reset" lstat() the worktree, even though th