projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b46f0b6) | patch
When the patch tries to create a new file and the file exists, abort.
authorJunio C Hamano <junkio@cox.net>
Wed, 4 May 2005 17:45:36 +0000 (10:45 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 4 May 2005 17:45:36 +0000 (10:45 -0700)
commit8a9d32b7e9f3aebd9c322c4613c4608224d09a60
treed952b69c7ba71b0f5628166bfcc81abb67ed818ftree | snapshot
parentb46f0b6dfd09629645efc59cda76e7e4fad7ca39commit | diff
When the patch tries to create a new file and the file exists, abort.

This fixes an error introduced to git-apply-patch-script in the previous
round.  We do not invoke patch for create/delete case, so we need to
be a bit careful about detecting conflicts like this.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-apply-patch-script diff | blob | history
The core git plumbing