projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 887a612) | patch
merge: loosen overcautious "working file will be lost" check.
authorJunio C Hamano <junkio@cox.net>
Mon, 9 Oct 2006 05:48:06 +0000 (22:48 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 28 Oct 2006 00:16:39 +0000 (17:16 -0700)
commited93b449c5e13a70beb7f0ae02fb6da95e42a805
tree717a934889e5f29199b460ab720e0e227ee4aac3tree | snapshot
parent887a612fef942dd3e7dae452e2dc582738b0fb41commit | diff
merge: loosen overcautious "working file will be lost" check.

The three-way merge complained unconditionally when a path that
does not exist in the index is involved in a merge when it
existed in the working tree.  If we are merging an old version
that had that path tracked, but the path is not tracked anymore,
and if we are merging that old version in, the result will be
that the path is not tracked.  In that case we should not
complain.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-one-file.sh diff | blob | history
t/t1004-read-tree-m-u-wf.sh [new file with mode: 0755] blob
unpack-trees.c diff | blob | history
Git—the stupid content tracker