]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: deda26b) | patch
git-merge-one-file: fix longstanding stupid thinko
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Mar 2008 23:47:18 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Mar 2008 05:17:17 +0000 (22:17 -0700)
commit29dc13319883f97618de6f03e8ffc5dc810d8786
treec89ed8648f02e797999c10b98f6af3445698aab1tree | snapshot
parentdeda26b9935bdca8d140006b224a278ec0377a33commit | diff
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>
git-merge-one-file.sh diff | blob | blame | history
t/t1004-read-tree-m-u-wf.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.