]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eed4664) | patch
apply: handle type-changing patch correctly.
authorJunio C Hamano <junkio@cox.net>
Mon, 17 Jul 2006 07:10:47 +0000 (00:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 17 Jul 2006 07:10:47 +0000 (00:10 -0700)
commit7f95aef28fa1e2662aebb4556c71ad6912d395e5
tree57fbcb9b99c40bdf75742df2e21637294998921ctree | snapshot
parenteed46644ca48ad08e1fd71e14afbe801399e8a67commit | diff
apply: handle type-changing patch correctly.

A type-change diff is always split into a patch to delete old,
immediately followed by a patch to create new.  check_patch()
routine noticed that the path to be created already exists in
the working tree and/or in the index when looking at the
creation patch and mistakenly thought it to be an error.

Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-apply.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.