| commit | 29dc13319883f97618de6f03e8ffc5dc810d8786 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Mar 2008 23:47:18 +0000 (17 16:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Mar 2008 05:17:17 +0000 (18 22:17 -0700) | ||
| tree | c89ed8648f02e797999c10b98f6af3445698aab1 | treesnapshot (tar.gz zip) |
| parent | deda26b9935bdca8d140006b224a278ec0377a33 | commitdiff |
git-merge-one-file: fix longstanding stupid thinko
When a merge result creates a new file, and when our side already has a
file in the path, taking the merge result may clobber the untracked file.
However, the logic to detect this situation was totally the wrong way. We
should complain when the file exists, not when the file does not exist.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When a merge result creates a new file, and when our side already has a
file in the path, taking the merge result may clobber the untracked file.
However, the logic to detect this situation was totally the wrong way. We
should complain when the file exists, not when the file does not exist.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-merge-one-file.sh | diffblobblamehistory | |
| t/t1004-read-tree-m-u-wf.sh | diffblobblamehistory |